From: Dmitry V. Levin <ldv@altlinux.org>
Date: Sat, 31 Aug 2019 16:20:44 +0000 (+0000)
Subject: tests: convert ksysent.test into a generated test
X-Git-Tag: v5.3~35
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c49872e30f692bace2f042da608c88fb2c47b237;p=strace

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 de59599b..78874743 100755
--- 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 d8302165..03d62225 100644
--- 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 156e359a..799df074 100644
--- 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 ab844128..13a46194 100644
--- 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
index 347ed675..00000000
--- 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