test: Slightly improve names of test directories

Signed-off-by: Magnus Malm <magnusmalm@gmail.com>

test/Makefile.am

@@ -1,10 +1,10 @@
-AM_TESTS_ENVIRONMENT = make --silent --no-print-directory -C test_root/;
+AM_TESTS_ENVIRONMENT = make --silent --no-print-directory -C test-root/;
 
-TESTS		     = checkself.sh
-TESTS		     += test_add_remove_dynamic_service/test.sh
-TESTS		     += test_add_remove_dynamic_service_sub_config/test.sh
-TESTS                += test_start_stop_service/test.sh
-TESTS                += test_start_stop_service_sub_config/test.sh
+TESTS                = checkself.sh
+TESTS                += add-remove-dynamic-service/test.sh
+TESTS                += add-remove-dynamic-service-sub-config/test.sh
+TESTS                += start-stop-service/test.sh
+TESTS                += start-stop-service-sub-config/test.sh
 
 clean-local:
-	make -C test_root/ clean
+	make -C test-root/ clean

test/add-remove-dynamic-service-sub-config/test.sh

@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")/..
-TESTENV_ROOT="$TEST_DIR"/test_root
+TESTENV_ROOT="$TEST_DIR"/test-root
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
@@ -18,7 +18,7 @@ test_teardown() {
 
 say "Test start $(date)"
 
-cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test-root/test_assets/
 
 say "Add a dynamic service in $FINIT_CONF_DIR/service.conf"
 texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF_DIR/service.conf"

test/add-remove-dynamic-service/test.sh

@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")/..
-TESTENV_ROOT="$TEST_DIR"/test_root
+TESTENV_ROOT="$TEST_DIR"/test-root
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
@@ -18,7 +18,7 @@ test_teardown() {
 
 say "Test start $(date)"
 
-cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test-root/test_assets/
 
 say "Add a dynamic service in $FINIT_CONF"
 texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"

test/start-stop-service-sub-config/test.sh

@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")/..
-TESTENV_ROOT="$TEST_DIR"/test_root
+TESTENV_ROOT="$TEST_DIR"/test-root
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
@@ -18,7 +18,7 @@ test_teardown() {
 
 say "Test start $(date)"
 
-cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test-root/test_assets/
 
 say "Add service stanza in $FINIT_CONF_DIR/service.conf"
 texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF_DIR/service.conf"

test/start-stop-service/test.sh

@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")/..
-TESTENV_ROOT="$TEST_DIR"/test_root
+TESTENV_ROOT="$TEST_DIR"/test-root
 
 # shellcheck source=/dev/null
 . "$TEST_DIR/lib.sh"
@@ -18,7 +18,7 @@ test_teardown() {
 
 say "Test start $(date)"
 
-cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test_root/test_assets/
+cp "$TEST_DIR"/common/service.sh "$TEST_DIR"/test-root/test_assets/
 
 say "Add service stanza in $FINIT_CONF"
 texec sh -c "echo 'service [2345] kill:20 log /test_assets/service.sh' > $FINIT_CONF"

test/testenv_exec.sh

@@ -11,7 +11,7 @@ target="$1"
 shift
 
 TEST_DIR=$(dirname "$0")
-TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
+TESTS_ROOT="$(pwd)/${TEST_DIR}/test-root"
 
 nsenter=$(command -v nsenter)
 chroot=$(command -v chroot)

test/testenv_start.sh

@@ -3,7 +3,7 @@
 set -eu
 
 TEST_DIR=$(dirname "$0")
-TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
+TESTS_ROOT="$(pwd)/${TEST_DIR}/test-root"
 
 unshare=$(command -v unshare)
 chroot=$(command -v chroot)