From 9775f1a7c67bfc86b776522c09c7329a6f1ce55f Mon Sep 17 00:00:00 2001 From: Gary Yendell Date: Tue, 15 Nov 2022 21:24:32 +0000 Subject: [PATCH] WIP - Update install paths for new source directory path --- cpp/test/dummy_example/frameProcessor.sh | 4 ++-- cpp/test/dummy_example/frameReceiver.sh | 4 ++-- cpp/test/dummy_example/frameSimulator.sh | 2 +- cpp/test/integrationTest/config/dummyUDP-fp.json | 4 ++-- cpp/test/integrationTest/config/dummyUDP-fr.json | 2 +- cpp/test/integrationTest/config/dummyUDP.json | 16 ++++++++-------- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cpp/test/dummy_example/frameProcessor.sh b/cpp/test/dummy_example/frameProcessor.sh index 09bae6e7f..c8636e690 100755 --- a/cpp/test/dummy_example/frameProcessor.sh +++ b/cpp/test/dummy_example/frameProcessor.sh @@ -1,8 +1,8 @@ #!/bin/bash -${OdinData_SOURCE_DIR}/prefix/bin/frameProcessor \ +${OdinData_SOURCE_DIR}/../prefix/bin/frameProcessor \ --ctrl tcp://0.0.0.0:5004 \ --meta tcp://*:5558 \ - --json_file ${OdinData_SOURCE_DIR}/prefix/test_config/dummyUDP-fp.json \ + --json_file ${OdinData_SOURCE_DIR}/../prefix/test_config/dummyUDP-fp.json \ --logconfig ${OdinData_SOURCE_DIR}/config/fp_log4cxx.xml \ --debug-level 3 diff --git a/cpp/test/dummy_example/frameReceiver.sh b/cpp/test/dummy_example/frameReceiver.sh index b73c7cc8c..c037cc2c7 100755 --- a/cpp/test/dummy_example/frameReceiver.sh +++ b/cpp/test/dummy_example/frameReceiver.sh @@ -1,8 +1,8 @@ #!/bin/bash -${OdinData_SOURCE_DIR}/prefix/bin/frameReceiver \ +${OdinData_SOURCE_DIR}/../prefix/bin/frameReceiver \ --ctrl tcp://0.0.0.0:5000 \ - --json_file ${OdinData_SOURCE_DIR}/prefix/test_config/dummyUDP-fr.json \ + --json_file ${OdinData_SOURCE_DIR}/../prefix/test_config/dummyUDP-fr.json \ --frames 10 \ --logconfig ${OdinData_SOURCE_DIR}/config/fr_log4cxx.xml \ --debug-level 3 diff --git a/cpp/test/dummy_example/frameSimulator.sh b/cpp/test/dummy_example/frameSimulator.sh index 6f1006dab..30bdb680c 100755 --- a/cpp/test/dummy_example/frameSimulator.sh +++ b/cpp/test/dummy_example/frameSimulator.sh @@ -1,6 +1,6 @@ #!/bin/bash -${OdinData_SOURCE_DIR}/prefix/bin/frameSimulator \ +${OdinData_SOURCE_DIR}/../prefix/bin/frameSimulator \ DummyUDP \ --lib-path prefix/lib \ --logconfig ${OdinData_SOURCE_DIR}/config/fs_log4cxx.xml \ diff --git a/cpp/test/integrationTest/config/dummyUDP-fp.json b/cpp/test/integrationTest/config/dummyUDP-fp.json index 6a5db08dd..1ad926b2b 100644 --- a/cpp/test/integrationTest/config/dummyUDP-fp.json +++ b/cpp/test/integrationTest/config/dummyUDP-fp.json @@ -16,7 +16,7 @@ { "index":"hdf", "name":"FileWriterPlugin", - "library":"${OdinData_SOURCE_DIR}/prefix/lib/libHdf5Plugin.so" + "library":"${OdinData_SOURCE_DIR}/../prefix/lib/libHdf5Plugin.so" } } }, @@ -27,7 +27,7 @@ { "index":"dummy", "name":"DummyUDPProcessPlugin", - "library":"${OdinData_SOURCE_DIR}/prefix/lib/libDummyUDPProcessPlugin.so" + "library":"${OdinData_SOURCE_DIR}/../prefix/lib/libDummyUDPProcessPlugin.so" } } }, diff --git a/cpp/test/integrationTest/config/dummyUDP-fr.json b/cpp/test/integrationTest/config/dummyUDP-fr.json index b4f287f4c..82e2ed9bc 100644 --- a/cpp/test/integrationTest/config/dummyUDP-fr.json +++ b/cpp/test/integrationTest/config/dummyUDP-fr.json @@ -1,7 +1,7 @@ [ { "decoder_type": "DummyUDP", - "decoder_path": "${OdinData_SOURCE_DIR}/prefix/lib", + "decoder_path": "${OdinData_SOURCE_DIR}/../prefix/lib", "rx_ports": "61649", "max_buffer_mem": 840000000, "decoder_config": { diff --git a/cpp/test/integrationTest/config/dummyUDP.json b/cpp/test/integrationTest/config/dummyUDP.json index 2ee07961b..93c1de3b5 100644 --- a/cpp/test/integrationTest/config/dummyUDP.json +++ b/cpp/test/integrationTest/config/dummyUDP.json @@ -3,32 +3,32 @@ { "receiver": { "process" : true, - "command": "${OdinData_SOURCE_DIR}/prefix/bin/frameReceiver", + "command": "${OdinData_SOURCE_DIR}/../prefix/bin/frameReceiver", "pos-args": "", "sleep": "1" }, "processor": { "process": true, - "command": "${OdinData_SOURCE_DIR}/prefix/bin/frameProcessor", + "command": "${OdinData_SOURCE_DIR}/../prefix/bin/frameProcessor", "pos-args": "", "sleep": "1" }, "simulator": { "process" : false, - "command": "${OdinData_SOURCE_DIR}/prefix/bin/frameSimulator", + "command": "${OdinData_SOURCE_DIR}/../prefix/bin/frameSimulator", "pos-args": "DummyUDP", "sleep": "10" }, "test": { "process" : false, - "command": "${OdinData_SOURCE_DIR}/prefix/bin/frameTests --log_level=all -- ", + "command": "${OdinData_SOURCE_DIR}/../prefix/bin/frameTests --log_level=all -- ", "pos-args": "", "sleep": "1" } }, "simulator": { - "lib-path": "${OdinData_SOURCE_DIR}/prefix/lib", + "lib-path": "${OdinData_SOURCE_DIR}/../prefix/lib", "frames": "10", "dest-ip": "127.0.0.1", "ports": "61649", @@ -36,15 +36,15 @@ }, "receiver": { - "json_file": "${OdinData_SOURCE_DIR}/prefix/test_config/dummyUDP-fr.json", + "json_file": "${OdinData_SOURCE_DIR}/../prefix/test_config/dummyUDP-fr.json", "frames": 10 }, "processor": { - "json_file": "${OdinData_SOURCE_DIR}/prefix/test_config/dummyUDP-fp.json" + "json_file": "${OdinData_SOURCE_DIR}/../prefix/test_config/dummyUDP-fp.json" }, "test": { - "json": "${OdinData_SOURCE_DIR}/prefix/test_config/testUDP.json" + "json": "${OdinData_SOURCE_DIR}/../prefix/test_config/testUDP.json" } }