From: Romain Forlot <romain.forlot@iot.bzh>
Date: Wed, 12 Sep 2018 14:01:59 +0000 (+0200)
Subject: Reach fixture files in all cases.
X-Git-Tag: 6.90.0~1
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=3e6d3fa8be349b40d6fd03d198b5e033cc7719e2;hp=01715613f16113017529c51703f3e5d90918c4c5;p=apps%2Fagl-service-can-low-level.git

Reach fixture files in all cases.

Depending if you are executing tests on a board or natively
with one or more binders you have to reliably be able to reach
your fixtures files. Using the bindingRootDir you always point to
the right directory and know exactly where are your files.

Change-Id: I61e7cd9d7ff43637dff6e63ffc82a7485cf92443
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
---

diff --git a/test/afb-test/tests/low-can_BasicAPITest.lua b/test/afb-test/tests/low-can_BasicAPITest.lua
index bda5bf0e..59e10d0e 100644
--- a/test/afb-test/tests/low-can_BasicAPITest.lua
+++ b/test/afb-test/tests/low-can_BasicAPITest.lua
@@ -58,13 +58,12 @@ _AFT.describe("Diagnostic_engine_speed_simulation", function()
         _AFT.assertIsTrue(data.name == "diagnostic_messages.engine.speed")
     end)
 
-    local ret = os.execute("./var/replay_launcher.sh ./var/test1.canreplay")
+    local ret = os.execute("bash ".._AFT.bindingRootDir.."/var/replay_launcher.sh ".._AFT.bindingRootDir.."/var/test1.canreplay")
     _AFT.assertIsTrue(ret)
 
     _AFT.assertEvtReceived(api .."/diagnostic_messages", 1000000)
 
     _AFT.assertVerbStatusSuccess("low-can","unsubscribe", { event = evt })
-
 end)
 
 _AFT.describe("Subscribe_all", function()
@@ -77,7 +76,7 @@ _AFT.describe("Subscribe_all", function()
 
     _AFT.assertVerbStatusSuccess(api,"subscribe", { event = "*" })
 
-    local ret = os.execute("./var/replay_launcher.sh ./var/test2-3.canreplay")
+    local ret = os.execute("bash ".._AFT.bindingRootDir.."/var/replay_launcher.sh ".._AFT.bindingRootDir.."/var/test2-3.canreplay")
     _AFT.assertIsTrue(ret)
 
     _AFT.assertEvtReceived(api .."/".. evt, 5000000);
diff --git a/test/afb-test/tests/low-can_FilterTest01.lua b/test/afb-test/tests/low-can_FilterTest01.lua
index 10e870e2..fac56950 100644
--- a/test/afb-test/tests/low-can_FilterTest01.lua
+++ b/test/afb-test/tests/low-can_FilterTest01.lua
@@ -47,7 +47,7 @@ _AFT.describe("Filter_Test_01/Step_1", function()
     end)
 
     _AFT.assertVerbStatusSuccess(api ,"subscribe", { event = evt, filter =  { min = 30, max = 100}})
-    os.execute("./var/replay_launcher.sh ./var/testFilter01filteredOut.canreplay");
+    os.execute("bash ".._AFT.bindingRootDir.."/var/replay_launcher.sh ".._AFT.bindingRootDir.."/var/testFilter01filteredOut.canreplay");
 
     _AFT.assertEvtNotReceived(api .. "/" ..evt, 1000000)
 end)
@@ -62,7 +62,7 @@ _AFT.describe("Filter_Test_01/Step_2", function()
     end)
 
     _AFT.assertVerbStatusSuccess(api ,"subscribe", { event = evt, filter =  {min = 30, max = 100}})
-    os.execute("./var/replay_launcher.sh ./var/testFilter01pass.canreplay");
+    os.execute("bash ".._AFT.bindingRootDir.."/var/replay_launcher.sh ".._AFT.bindingRootDir.."/var/testFilter01pass.canreplay");
 
     _AFT.assertEvtReceived(api .. "/" ..evt, 1000000)
     _AFT.assertVerbStatusSuccess(api,"unsubscribe", { event = evt, filter =  {min = 30, max = 100} })
@@ -83,7 +83,7 @@ _AFT.describe("Filter_Test_01/Step_3", function()
     end)
 
     _AFT.assertVerbStatusSuccess(api ,"subscribe", { event = evt, filter =  { frequency = 1 , min = 30, max = 100}})
-    os.execute("./var/replay_launcher.sh ./var/testFilter01pass.canreplay");
+    os.execute("bash ".._AFT.bindingRootDir.."/var/replay_launcher.sh ".._AFT.bindingRootDir.."/var/testFilter01pass.canreplay");
 
     _AFT.assertEvtGrpReceived({[api .."/"..evt]= 2}, 5000000)
     _AFT.assertVerbStatusSuccess(api,"unsubscribe", { event = evt, filter =  { frequency = 1 , min = 30, max = 100}})