diff options
| author | Andrew G. Morgan <morgan@kernel.org> | 2020-12-01 21:04:14 -0800 |
|---|---|---|
| committer | Andrew G. Morgan <morgan@kernel.org> | 2020-12-07 20:28:24 -0800 |
| commit | 8361f2999a41b1ff0a5c23ef225b954558dfc1dc (patch) | |
| tree | 589db3d22d5655e4cb986d0f684ff30415a401c2 | |
| parent | 6e985f8b53ee9cddfc7466c8b8beeb187cc707d0 (diff) | |
| download | libcap-8361f2999a41b1ff0a5c23ef225b954558dfc1dc.tar.gz | |
Make quicktest.sh work again with kernel test
It has been a while since I tried:
make -C kdebug test
A few details for quicktest.sh's dependencies have changed, so
accommodate them.
Also support custom local experiments in the QEMU session.
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
| -rwxr-xr-x | kdebug/test-kernel.sh | 17 | ||||
| -rw-r--r-- | kdebug/test-passwd | 1 | ||||
| -rwxr-xr-x | progs/quicktest.sh | 4 |
3 files changed, 17 insertions, 5 deletions
diff --git a/kdebug/test-kernel.sh b/kdebug/test-kernel.sh index d480a63..1326cd7 100755 --- a/kdebug/test-kernel.sh +++ b/kdebug/test-kernel.sh @@ -13,7 +13,8 @@ function die { } pushd .. -make || die "failed to make libcap tree" +make test || die "failed to make test of libcap tree" +make -C progs tcapsh-static || die "failed to make progs/tcapsh-static" popd # Assumes desired make *config (eg. make defconfig) is already done. @@ -45,9 +46,16 @@ file /root/setcap $HERE/../progs/setcap 0755 0 0 file /root/getcap $HERE/../progs/getcap 0755 0 0 file /root/capsh $HERE/../progs/capsh 0755 0 0 file /root/getpcaps $HERE/../progs/getpcaps 0755 0 0 +file /root/tcapsh-static $HERE/../progs/tcapsh-static 0755 0 0 EOF -COMMANDS="ls ln cp dmesg id pwd mkdir rmdir cat rm sh mount umount chmod less vi" +# convenience for some local experiments +if [ -f "$HERE/extras.sh" ]; then + echo "local, uncommitted enhancements to kernel test" + . "$HERE/extras.sh" +fi + +COMMANDS="awk cat chmod cp dmesg fgrep id less ln ls mkdir mount pwd rm rmdir sh sort umount uniq vi" for f in $COMMANDS; do echo slink /bin/$f /sbin/busybox 0755 0 0 >> fs.conf done @@ -59,9 +67,10 @@ done $KBASE/usr/gen_init_cpio fs.conf | gzip -9 > initramfs.img -KERNEL=$KBASE/arch/x86_64/boot/bzImage +KERNEL=$KBASE/arch/$(uname -m)/boot/bzImage qemu-system-$(uname -m) -m 1024 \ -kernel $KERNEL \ -initrd initramfs.img \ - -append "$APPEND" + -append "$APPEND" \ + -smp sockets=2,dies=1,cores=4 diff --git a/kdebug/test-passwd b/kdebug/test-passwd index 4fa92a4..0ff71df 100644 --- a/kdebug/test-passwd +++ b/kdebug/test-passwd @@ -1,2 +1,3 @@ root:x:0:0:root:/root:/bin/bash +luser:x:1:1:Luser:/:/bin/bash nobody:x:99:99:Nobody:/:/sbin/nologin diff --git a/progs/quicktest.sh b/progs/quicktest.sh index 1c21bb4..6aa2598 100755 --- a/progs/quicktest.sh +++ b/progs/quicktest.sh @@ -255,6 +255,8 @@ if [ -f ../go/compare-cap ]; then fi echo "PASSED" else - echo "no Go support compiled" + echo "no Go support compiled, so skipping Go tests" fi rm -f compare-cap + +echo "ALL TESTS PASSED!" |