tests: convert ksysent.test into a generated test

* tests/ksysent.test: Remove.
* tests/Makefile.am (MISC_TESTS): Remove ksysent.test.
* tests/gen_tests.in (ksysent): New entry.
* ci/run-build-and-tests.sh: Replace ksysent.log with ksysent.gen.log.
* strace.spec.in: Likewise.

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index de59599b02b1a4906d8dc00009cf77629dd4fd64..78874743f7d5c2cff617442e9d1c6b656710f0ad 100755 (executable)
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -94,7 +94,7 @@ case "${CHECK-}" in
                make -k $j check VERBOSE=${VERBOSE-}
                codecov --gcov-args=-abcp ||:
                echo 'BEGIN OF TEST SUITE INFORMATION'
-               tail -n 99999 -- tests*/test-suite.log tests*/ksysent.log
+               tail -n 99999 -- tests*/test-suite.log tests*/ksysent.gen.log
                echo 'END OF TEST SUITE INFORMATION'
                ;;
        valgrind)
@@ -106,7 +106,7 @@ case "${CHECK-}" in
                                        rc=$?
                done
                echo 'BEGIN OF TEST SUITE INFORMATION'
-               tail -n 99999 -- tests*/test-suite*.log tests*/ksysent.log ||
+               tail -n 99999 -- tests*/test-suite*.log tests*/ksysent.gen.log ||
                        rc=$?
                echo 'END OF TEST SUITE INFORMATION'
                [ "$rc" -eq 0 ]

diff --git a/strace.spec.in b/strace.spec.in
index d8302165e0dc5bd7bf31ffca40c1a5876796356c..03d62225ebf9b8f764722f0a3cac2d790b310d5d 100644 (file)
--- a/strace.spec.in
+++ b/strace.spec.in
@@ -82,7 +82,7 @@ wait
 %{buildroot}%{_bindir}/strace -V
 make %{?_smp_mflags} -k check VERBOSE=1
 echo 'BEGIN OF TEST SUITE INFORMATION'
-tail -n 99999 -- tests*/test-suite.log tests*/ksysent.log
+tail -n 99999 -- tests*/test-suite.log tests*/ksysent.gen.log
 find tests* -type f -name '*.log' -print0 |
        xargs -r0 grep -H '^KERNEL BUG:' -- ||:
 echo 'END OF TEST SUITE INFORMATION'

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 156e359a80d49db1b68606c9c22a1588b5bdb3a0..799df074dc0a697d9d299d642b9665b913c6cd13 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -321,7 +321,6 @@ MISC_TESTS = \
        inject-nf.test \
        interactive_block.test \
        kill_child.test \
-       ksysent.test \
        localtime.test \
        looping_threads.test \
        opipe.test \

diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index ab844128a34fd69f17ff382172eba558ef5f714c..13a4619447e0cad9c79958698d18df530f982692 100644 (file)
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -193,6 +193,7 @@ keyctl-Xabbrev      -a31 -s10 -e trace=keyctl -Xabbrev
 keyctl-Xraw    -a13 -s10 -e trace=keyctl -Xraw
 keyctl-Xverbose        -a41 -s10 -e trace=keyctl -Xverbose
 kill   -a12 -esignal=none
+ksysent        ../$NAME
 lchown -a30
 lchown32       -a32
 link

diff --git a/tests/ksysent.test b/tests/ksysent.test
deleted file mode 100755 (executable)
index 347ed67..0000000
--- a/tests/ksysent.test
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2015-2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# Validate syscallent.h
-
-./ksysent