Merge branch 'master' into 6.7

dimkr · Sep 30, 2020 · 6e72cbc · 6e72cbc
2 parents 3fabc84 + 5634671
commit 6e72cbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ci.sh b/ci.sh
@@ -3,6 +3,7 @@
 meson --buildtype=release --prefix=/usr build
 DESTDIR=../dst ninja -C build install
 ./dst/usr/bin/ksh -c "kill -l"
+[ "`echo 'kill -l 9' | ./dst/usr/bin/ksh`" != KILL ] && exit 1
 [ -n "`./dst/usr/bin/ksh -c 'echo &' 2>&1 | grep 'internal error'`" ] && exit 1
 [ "`./dst/usr/bin/ksh -c 'echo $((1337 * 2))'`" -ne 2674 ] && exit 1
 [ "`./dst/usr/bin/ksh -c 'seq 1337 | sort -rn | head -n 1'`" -ne 1337 ] && exit 1

diff --git a/subprojects/lolibc b/subprojects/lolibc
+1 −7		meson.build
+64 −1		sys_signame.c
+0 −13		sys_signame.sh