From d9ae98e4d8d4e8773d7db96e1d977ca8eff08472 Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdair.sullivan@askuity.com>
Date: Sun, 6 Dec 2015 23:14:25 -0800
Subject: symlink mib hrl output in apps `include' directories
this restores compatibility with rebar2 and erlang.mk
---
test/rebar_compile_SUITE.erl | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'test')
diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
index 3e7e015..1170a44 100644
--- a/test/rebar_compile_SUITE.erl
+++ b/test/rebar_compile_SUITE.erl
@@ -1025,6 +1025,9 @@ mib_test(Config) ->
%% check a hrl corresponding to the mib in the mibs dir exists in priv/mibs/include
true = filelib:is_file(filename:join([PrivMibsDir, "include", "SIMPLE-MIB.hrl"])),
+ %% check a hrl corresponding to the mib in the mibs dir exists in include
+ true = filelib:is_file(filename:join([AppDir, "include", "SIMPLE-MIB.hrl"])),
+
%% check the mibs dir was linked into the _build dir
true = filelib:is_dir(filename:join([AppDir, "_build", "default", "lib", Name, "mibs"])).
@@ -1075,6 +1078,9 @@ umbrella_mib_first_test(Config) ->
%% check a hrl corresponding to the mib in the mibs dir exists in priv/mibs/include
true = filelib:is_file(filename:join([PrivMibsDir, "include", "SIMPLE-MIB.hrl"])),
+ %% check a hrl corresponding to the mib in the mibs dir exists in include
+ true = filelib:is_file(filename:join([AppDir, "include", "SIMPLE-MIB.hrl"])),
+
%% check the mibs dir was linked into the _build dir
true = filelib:is_dir(filename:join([AppsDir, "_build", "default", "lib", Name, "mibs"])).
--
cgit v1.1
From 6f70b7fc881dc02e06d51ed9204c6a128f2d49e7 Mon Sep 17 00:00:00 2001
From: alisdair sullivan <alisdair.sullivan@askuity.com>
Date: Tue, 8 Dec 2015 08:48:42 -0800
Subject: remove mib header file in `priv/mibs/include'
---
test/rebar_compile_SUITE.erl | 6 ------
1 file changed, 6 deletions(-)
(limited to 'test')
diff --git a/test/rebar_compile_SUITE.erl b/test/rebar_compile_SUITE.erl
index 1170a44..ef9cf97 100644
--- a/test/rebar_compile_SUITE.erl
+++ b/test/rebar_compile_SUITE.erl
@@ -1022,9 +1022,6 @@ mib_test(Config) ->
PrivMibsDir = filename:join([AppDir, "_build", "default", "lib", Name, "priv", "mibs"]),
true = filelib:is_file(filename:join([PrivMibsDir, "SIMPLE-MIB.bin"])),
- %% check a hrl corresponding to the mib in the mibs dir exists in priv/mibs/include
- true = filelib:is_file(filename:join([PrivMibsDir, "include", "SIMPLE-MIB.hrl"])),
-
%% check a hrl corresponding to the mib in the mibs dir exists in include
true = filelib:is_file(filename:join([AppDir, "include", "SIMPLE-MIB.hrl"])),
@@ -1075,9 +1072,6 @@ umbrella_mib_first_test(Config) ->
PrivMibsDir = filename:join([AppsDir, "_build", "default", "lib", Name, "priv", "mibs"]),
true = filelib:is_file(filename:join([PrivMibsDir, "SIMPLE-MIB.bin"])),
- %% check a hrl corresponding to the mib in the mibs dir exists in priv/mibs/include
- true = filelib:is_file(filename:join([PrivMibsDir, "include", "SIMPLE-MIB.hrl"])),
-
%% check a hrl corresponding to the mib in the mibs dir exists in include
true = filelib:is_file(filename:join([AppDir, "include", "SIMPLE-MIB.hrl"])),
--
cgit v1.1