From 702b22d4a3e8e40b27c471f739a61e33f5335e0c Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 4 Apr 2022 20:15:27 +0200 Subject: [PATCH] .github: check if ~/.cache exists, dump test root files Signed-off-by: Joachim Wiberg --- .github/workflows/build.yml | 5 ++++- test/add-remove-dynamic-service.sh | 3 +++ test/setup-root.sh | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c832148..5c0e317d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -60,9 +60,12 @@ jobs: /tmp/sbin/initctl -h - name: Run Unit Tests run: | + echo "~/.cache contents ==============" + ls -l ~/.cache + echo "================================" ver=$(/tmp/sbin/initctl -V | awk '/Finit.*/ {print $2;}') dir=finit-$ver/_build/sub - make -j1 distcheck || (cat $dir/test/test-suite.log; false) + make -j1 distcheck || (cat $dir/test/setup-root.log; cat $dir/test/test-suite.log; false) - name: Upload Test Results uses: actions/upload-artifact@v2 with: diff --git a/test/add-remove-dynamic-service.sh b/test/add-remove-dynamic-service.sh index 9f6174fe..8972741f 100755 --- a/test/add-remove-dynamic-service.sh +++ b/test/add-remove-dynamic-service.sh @@ -16,6 +16,9 @@ test_teardown() texec rm -f /test_assets/service.sh } +say "Hi, this is /run et al" +texec sh -c "ls -l /bin/; ls -l /sbin/; ls -l /run/; ls -l /dev/" + say "Test start $(date)" cp "$TEST_DIR"/common/service.sh "$TENV_ROOT"/test_assets/ diff --git a/test/setup-root.sh b/test/setup-root.sh index 4662ecb2..19a99f0d 100755 --- a/test/setup-root.sh +++ b/test/setup-root.sh @@ -12,3 +12,10 @@ FINITBIN="$(pwd)/$top_builddir/src/finit" DEST="$TENV_ROOT" make -f "$srcdir/ten for plugin in tty.so urandom.so rtc.so modprobe.so hotplug.so; do find "$TENV_ROOT" -name $plugin -delete done + +ls -l $DESTDIR +ls -l $DESTDIR/bin +ls -l $DESTDIR/sbin +ls -l $DESTDIR/var/ +ls -l $DESTDIR/var/run/ +