wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-16 10:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Minor tweaks of how/when to print testenv stuff

Browse Source 
Signed-off-by: Magnus Malm <magnusmalm@gmail.com>
This commit is contained in:
Magnus Malm committed 2021-02-23 11:19:57 +01:00
1 parent 5e20abef8d
commit 3ec788a6cf
2 files changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/lib.sh
+7 -3
View File
@@ -96,13 +96,17 @@ TEST_NAME="$(dirname "$0")"
TEST_NAME=${TEST_NAME#*/} TEST_NAME=${TEST_NAME#*/}
export TEST_NAME export TEST_NAME
log "$color_reset" 'Test start' '' # Setup test environment
log "$color_reset" '--' ''
# Setup
"$TEST_DIR/testenv_start.sh" finit & "$TEST_DIR/testenv_start.sh" finit &
finit_ppid=$! finit_ppid=$!
echo "$finit_ppid" > "$TEST_DIR"/running_test.pid echo "$finit_ppid" > "$TEST_DIR"/running_test.pid
>&2 echo "Hint: Execute 'test/testenv_enter.sh' to enter the test namespace"
>&2 echo "finit conf '$FINIT_CONF'"
>&2 echo "finit_conf dir '$FINIT_CONF_DIR'"
log "$color_reset" 'Setup of test environment done' ''
finit_pid=$(retry "pgrep -P $finit_ppid") finit_pid=$(retry "pgrep -P $finit_ppid")
tty=/dev/$(texec cat /sys/class/tty/console/active) tty=/dev/$(texec cat /sys/class/tty/console/active)
test/testenv_start.sh
-2
View File
@@ -5,8 +5,6 @@ set -eu
TEST_DIR=$(dirname "$0") TEST_DIR=$(dirname "$0")
TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root" TESTS_ROOT="$(pwd)/${TEST_DIR}/test_root"
>&2 echo "Hint: Execute 'test/testenv_enter.sh' to enter the test namespace"
unshare=$(command -v unshare) unshare=$(command -v unshare)
chroot=$(command -v chroot) chroot=$(command -v chroot)