Skip to content

Commit ae0e3c1

Browse files
REQREPLY-221: Improve test scripts
1 parent d9e5f8e commit ae0e3c1

File tree

9 files changed

+24
-16
lines changed

9 files changed

+24
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#!/bin/bash
2-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/dynamic_data_nested_structs/java
3-
java -Djava.library.path=$NDDSHOME/lib/x64Linux4gcc7.3.0 -cp ".:$NDDSHOME/lib/java/nddsjava.jar" DynamicDataNestedStruct $@
2+
3+
cd "$(dirname "$0")"
4+
file_name=$(basename $0 .sh)
5+
java -Djava.library.path=$NDDSHOME/lib/x64Linux4gcc7.3.0 -cp ".:$NDDSHOME/lib/java/nddsjava.jar" $file_name $@

tests/examples/connext_dds/remote_procedure_call/c++11/Inventory_client.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
# Change directory to the location of the example working directory
44
# to workaround DIT-193
55

6-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/remote_procedure_call/c++11
7-
./build/Inventory_client $@
6+
cd "$(dirname "$0")"
7+
file_name=$(basename $0 .sh)
8+
./build/$file_name $@

tests/examples/connext_dds/remote_procedure_call/c++11/Inventory_service.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
# Change directory to the location of the example working directory
44
# to workaround DIT-193
55

6-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/remote_procedure_call/c++11
7-
./build/Inventory_service $@
6+
cd "$(dirname "$0")"
7+
file_name=$(basename $0 .sh)
8+
./build/$file_name $@
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/remote_procedure_call/py
4-
/bin/python3 inventory_client.py $@
3+
cd "$(dirname "$0")"
4+
file_name=$(basename $0 .sh)
5+
/bin/python3 $file_name.py $@
56
rm -rf __pycache__
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/remote_procedure_call/py
4-
/bin/python3 inventory_service.py $@
3+
cd "$(dirname "$0")"
4+
file_name=$(basename $0 .sh)
5+
/bin/python3 $file_name.py $@
56
rm -rf __pycache__
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22

3-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/request_reply/cs
3+
cd "$(dirname "$0")"
44
/usr/bin/dotnet run -- --replier $@

tests/examples/connext_dds/request_reply/cs/PrimesRequester.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55
# to try to avoid the issue
66
sleep 10
77

8-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/request_reply/cs
8+
cd "$(dirname "$0")"
99
/usr/bin/dotnet run -- --requester $@
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/request_reply/py
4-
/bin/python3 primes_replier.py $@
3+
cd "$(dirname "$0")"
4+
file_name=$(basename $0 .sh)
5+
/bin/python3 $file_name.py $@
56
rm -rf __pycache__
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/bin/bash
22

3-
cd /test/connextdds_examples_suite/connextdds_examples_repo/examples/connext_dds/request_reply/py
4-
/bin/python3 primes_requester.py $@
3+
cd "$(dirname "$0")"
4+
file_name=$(basename $0 .sh)
5+
/bin/python3 $file_name.py $@
56
rm -rf __pycache__

0 commit comments

Comments
 (0)