Browse Source

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.
Dmitry V. Levin 1 month ago
parent
commit
c49872e30f
5 changed files with 4 additions and 14 deletions
  1. 2
    2
      ci/run-build-and-tests.sh
  2. 1
    1
      strace.spec.in
  3. 0
    1
      tests/Makefile.am
  4. 1
    0
      tests/gen_tests.in
  5. 0
    10
      tests/ksysent.test

+ 2
- 2
ci/run-build-and-tests.sh View File

@@ -94,7 +94,7 @@ case "${CHECK-}" in
94 94
 		make -k $j check VERBOSE=${VERBOSE-}
95 95
 		codecov --gcov-args=-abcp ||:
96 96
 		echo 'BEGIN OF TEST SUITE INFORMATION'
97
-		tail -n 99999 -- tests*/test-suite.log tests*/ksysent.log
97
+		tail -n 99999 -- tests*/test-suite.log tests*/ksysent.gen.log
98 98
 		echo 'END OF TEST SUITE INFORMATION'
99 99
 		;;
100 100
 	valgrind)
@@ -106,7 +106,7 @@ case "${CHECK-}" in
106 106
 					rc=$?
107 107
 		done
108 108
 		echo 'BEGIN OF TEST SUITE INFORMATION'
109
-		tail -n 99999 -- tests*/test-suite*.log tests*/ksysent.log ||
109
+		tail -n 99999 -- tests*/test-suite*.log tests*/ksysent.gen.log ||
110 110
 			rc=$?
111 111
 		echo 'END OF TEST SUITE INFORMATION'
112 112
 		[ "$rc" -eq 0 ]

+ 1
- 1
strace.spec.in View File

@@ -82,7 +82,7 @@ wait
82 82
 %{buildroot}%{_bindir}/strace -V
83 83
 make %{?_smp_mflags} -k check VERBOSE=1
84 84
 echo 'BEGIN OF TEST SUITE INFORMATION'
85
-tail -n 99999 -- tests*/test-suite.log tests*/ksysent.log
85
+tail -n 99999 -- tests*/test-suite.log tests*/ksysent.gen.log
86 86
 find tests* -type f -name '*.log' -print0 |
87 87
 	xargs -r0 grep -H '^KERNEL BUG:' -- ||:
88 88
 echo 'END OF TEST SUITE INFORMATION'

+ 0
- 1
tests/Makefile.am View File

@@ -321,7 +321,6 @@ MISC_TESTS = \
321 321
 	inject-nf.test \
322 322
 	interactive_block.test \
323 323
 	kill_child.test \
324
-	ksysent.test \
325 324
 	localtime.test \
326 325
 	looping_threads.test \
327 326
 	opipe.test \

+ 1
- 0
tests/gen_tests.in View File

@@ -193,6 +193,7 @@ keyctl-Xabbrev	-a31 -s10 -e trace=keyctl -Xabbrev
193 193
 keyctl-Xraw	-a13 -s10 -e trace=keyctl -Xraw
194 194
 keyctl-Xverbose	-a41 -s10 -e trace=keyctl -Xverbose
195 195
 kill	-a12 -esignal=none
196
+ksysent	../$NAME
196 197
 lchown	-a30
197 198
 lchown32	-a32
198 199
 link

+ 0
- 10
tests/ksysent.test View File

@@ -1,10 +0,0 @@
1
-#!/bin/sh
2
-#
3
-# Copyright (c) 2015-2018 The strace developers.
4
-# All rights reserved.
5
-#
6
-# SPDX-License-Identifier: GPL-2.0-or-later
7
-
8
-# Validate syscallent.h
9
-
10
-./ksysent

Loading…
Cancel
Save