ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-01-05 12:54:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move vomp console feature to test binary

Browse Source
This commit is contained in:
Jeremy Lakeman 2016-11-14 12:25:27 +10:30
parent 1e70bcaac6
commit 3726fe2f73
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
servald_features.c
View File

@ -33,7 +33,6 @@ void servald_features()
USE_FEATURE(cli_meshmb); USE_FEATURE(cli_meshmb);
USE_FEATURE(cli_monitor); USE_FEATURE(cli_monitor);
USE_FEATURE(cli_msp_proxy); USE_FEATURE(cli_msp_proxy);
USE_FEATURE(cli_vomp_console);
USE_FEATURE(cli_rhizome_direct); USE_FEATURE(cli_rhizome_direct);
USE_FEATURE(mdp_binding_MDP_PORT_ECHO); USE_FEATURE(mdp_binding_MDP_PORT_ECHO);

1
test_features.c
View File

@ -24,6 +24,7 @@ void test_features()
USE_FEATURE(cli_version); USE_FEATURE(cli_version);
USE_FEATURE(cli_echo); USE_FEATURE(cli_echo);
USE_FEATURE(cli_log); USE_FEATURE(cli_log);
USE_FEATURE(cli_vomp_console);
USE_FEATURE(cli_tests); USE_FEATURE(cli_tests);
} }

2
tests/server
View File

@ -186,7 +186,7 @@ setup_MonitorQuit() {
start_servald_server start_servald_server
} }
test_MonitorQuit() { test_MonitorQuit() {
executeOk_servald console < <(echo "monitor quit") executeOk --executable="$servald_build_root/serval-tests" console < <(echo "monitor quit")
tfw_cat --stdout --stderr tfw_cat --stdout --stderr
wait_until ! kill -0 $servald_pid 2>/dev/null wait_until ! kill -0 $servald_pid 2>/dev/null
} }

2
tests/vomp
View File

@ -51,7 +51,7 @@ vomp_console() {
local C="$instance_name" local C="$instance_name"
mkfifo "${C}_IN" mkfifo "${C}_IN"
exec 8<>"${C}_IN" # prevent fifo from blocking exec 8<>"${C}_IN" # prevent fifo from blocking
executeOk_servald --stdout-file="${C}_OUT" console <"${C}_IN" executeOk --executable="$servald_build_root/serval-tests" --stdout-file="${C}_OUT" console <"${C}_IN"
tfw_cat --stdout --stderr tfw_cat --stdout --stderr
} }