Adapt test suite to new scripts, scripts more flexible, bt not default

- rvi_install & rvi_ctl adapted so they can be run from different directories
- ensure that RVI_LOGDIR is respected consistently
- RVI_RUNDIR allows for specifying where the boot scripts are stored
- bt apps excluded by default, can be put back in through config if needed

7 files changed, 27 insertions, 23 deletions

diff --git a/priv/config/add_bt_apps.config b/priv/config/add_bt_apps.config
new file mode 100644
index 0000000..9eb9c9b
--- /dev/null
+++ b/priv/config/add_bt_apps.config
@@ -0,0 +1,5 @@
+%% -*- erlang -*-
+[
+ {add_apps, [bt, dlink_bt]},
+ {sort_app, bt, rvi_core}   %% start bt before rvi_core (not required)
+].
diff --git a/priv/config/rvi_common.config b/priv/config/rvi_common.config
index c8aa389..0b6cb8d 100644
--- a/priv/config/rvi_common.config
+++ b/priv/config/rvi_common.config
@@ -9,8 +9,6 @@
 %% Configuration include file for rvi config files
 %%
 Out = filename:absname(proplists:get_value(outdir, OPTIONS)).
-LagerRoot = Out ++ "/log/lager".
-LagerDebugFmt = [time,"<",module,"/",line,">",message,"\n"].
 
 %% Parameters for simpler modification
 Env = fun(V, Def) ->
@@ -22,6 +20,9 @@ Env = fun(V, Def) ->
               end
       end.
 
+LogDir = Env("RVI_LOGDIR", Out ++ "/log").
+LagerRoot = LogDir ++ "/lager".
+LagerDebugFmt = [time,"<",module,"/",line,">",message,"\n"].
 LogLevel = Env("RVI_LOGLEVEL", info).
 [
  %% All erlang apps needed to fire up a node. Do not touch.
@@ -63,11 +64,9 @@ LogLevel = Env("RVI_LOGLEVEL", info).
    service_edge,
    authorize,
    schedule,
-   bt,
    dlink,
    dlink_tcp,
    dlink_tls,
-   dlink_bt,
    dlink_sms,
    proto_bert,
    proto_json,
@@ -80,7 +79,8 @@ LogLevel = Env("RVI_LOGLEVEL", info).
   [
    {setup,
     [
-     {home, Out}
+     {home, Out},
+     {log_dir, LogDir}
     ]},
    {lager,
     [
diff --git a/priv/test_config/backend.config b/priv/test_config/backend.config
index 361b3da..106a1ba 100644
--- a/priv/test_config/backend.config
+++ b/priv/test_config/backend.config
@@ -1,14 +1,14 @@
 %% -*- erlang -*-
 {ok, CurDir} = file:get_cwd().
 [
- {include_lib, "rvi_core/priv/config/rvi_backend.config"},
- {set_env,
-  [
-   {rvi_core,
-    [{device_key, "$HOME/../../basic_backend_keys/device_key.pem"},
-     {root_cert, "$HOME/../../root_keys/root_cert.crt"},
-     {device_cert, "$HOME/../../basic_backend_keys/device_cert.crt"},
-     {cred_dir, "$HOME/../../basic_backend_creds"}
-    ]}
-  ]}
+ {include_lib, "rvi_core/priv/config/rvi_backend.config"}
+ %% {set_env,
+ %%  [
+ %%   {rvi_core,
+ %%    [{device_key, "$HOME/../../basic_backend_keys/device_key.pem"},
+ %%     {root_cert, "$HOME/../../root_keys/root_cert.crt"},
+ %%     {device_cert, "$HOME/../../basic_backend_keys/device_cert.crt"},
+ %%     {cred_dir, "$HOME/../../basic_backend_creds"}
+ %%    ]}
+ %%  ]}
 ].
diff --git a/priv/test_config/basic_backend.config b/priv/test_config/basic_backend.config
index 0c6aaa6..8640d76 100644
--- a/priv/test_config/basic_backend.config
+++ b/priv/test_config/basic_backend.config
@@ -2,7 +2,6 @@
 {ok, CurDir} = file:get_cwd().
 [
  {include_lib, "rvi_core/priv/test_config/backend.config"},
- {remove_apps, [bt, dlink_bt]},
  {set_env,
   [{rvi_core,
     [
diff --git a/priv/test_config/basic_sample.config b/priv/test_config/basic_sample.config
index 56f9a4c..794f3b2 100644
--- a/priv/test_config/basic_sample.config
+++ b/priv/test_config/basic_sample.config
@@ -1,6 +1,5 @@
 %% -*- erlang -*-
 {ok, CurDir} = file:get_cwd().
 [
- {include_lib, "rvi_core/priv/test_config/sample.config"},
- {remove_apps, [bt, dlink_bt]}
+ {include_lib, "rvi_core/priv/test_config/sample.config"}
 ].
diff --git a/priv/test_config/bt_backend.config b/priv/test_config/bt_backend.config
index 45cc5db..cb665d1 100644
--- a/priv/test_config/bt_backend.config
+++ b/priv/test_config/bt_backend.config
@@ -1,6 +1,7 @@
 %% -*- erlang -*-
 [
  {include_lib, "rvi_core/priv/test_config/backend.config"},
+ {include_lib, "rvi_core/priv/config/add_bt_apps.config"},
  {remove_apps, [dlink_tcp, dlink_tls]},
 
  {set_env,
diff --git a/priv/test_config/sample.config b/priv/test_config/sample.config
index ea84a30..3238563 100644
--- a/priv/test_config/sample.config
+++ b/priv/test_config/sample.config
@@ -6,11 +6,11 @@
   [
    {rvi_core,
     [
-     {node_service_prefix, "jlr.com/vin/abc"},
-     {device_key, "$HOME/../../basic_sample_keys/device_key.pem"},
-     {root_cert, "$HOME/../../root_keys/root_cert.crt"},
-     {device_cert, "$HOME/../../basic_sample_keys/device_cert.crt"},
-     {cred_dir, "$HOME/../../basic_sample_creds"}
+     {node_service_prefix, "jlr.com/vin/abc"}
+     %% {device_key, "$HOME/../../basic_sample_keys/device_key.pem"},
+     %% {root_cert, "$HOME/../../root_keys/root_cert.crt"},
+     %% {device_cert, "$HOME/../../basic_sample_keys/device_cert.crt"},
+     %% {cred_dir, "$HOME/../../basic_sample_creds"}
     ]}
   ]}
 ].