From f7d604f2c770214dfdee1f9b97d0693ec074540b Mon Sep 17 00:00:00 2001 From: Florian Krohm Date: Fri, 3 Apr 2015 15:47:19 +0000 Subject: [PATCH] New directory: none/tests/scripts Move corresponding testcases there. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@15065 --- configure.ac | 1 + none/tests/Makefile.am | 19 ++------------ none/tests/scripts/Makefile.am | 24 ++++++++++++++++++ none/tests/{ => scripts}/bug231357.stderr.exp | 0 none/tests/{ => scripts}/bug231357.stdout.exp | 0 none/tests/{ => scripts}/bug231357.vgtest | 0 none/tests/{ => scripts}/filter_linenos | 0 none/tests/{ => scripts}/filter_shell_output | 0 none/tests/scripts/filter_stderr | 8 ++++++ none/tests/{ => scripts}/shell | 0 none/tests/{ => scripts}/shell.stderr.exp | 0 .../tests/{ => scripts}/shell.stderr.exp-dash | 0 .../{ => scripts}/shell.stderr.exp-dash2 | 0 none/tests/{ => scripts}/shell.stdout.exp | 0 none/tests/{ => scripts}/shell.vgtest | 2 ++ none/tests/{ => scripts}/shell_badinterp | 0 .../{ => scripts}/shell_badinterp.stderr.exp | 0 .../{ => scripts}/shell_badinterp.vgtest | 1 + none/tests/{ => scripts}/shell_binaryfile | Bin .../{ => scripts}/shell_binaryfile.stderr.exp | 0 .../{ => scripts}/shell_binaryfile.vgtest | 1 + none/tests/{ => scripts}/shell_dir.stderr.exp | 0 none/tests/scripts/shell_dir.vgtest | 4 +++ .../{ => scripts}/shell_nonexec.stderr.exp | 0 none/tests/{ => scripts}/shell_nonexec.vgtest | 1 + .../{ => scripts}/shell_nosuchfile.stderr.exp | 0 .../{ => scripts}/shell_nosuchfile.vgtest | 1 + none/tests/{ => scripts}/shell_valid1 | 0 .../{ => scripts}/shell_valid1.stderr.exp | 0 none/tests/{ => scripts}/shell_valid1.vgtest | 0 none/tests/{ => scripts}/shell_valid2 | 0 .../{ => scripts}/shell_valid2.stderr.exp | 0 none/tests/{ => scripts}/shell_valid2.vgtest | 0 none/tests/{ => scripts}/shell_valid3 | 0 .../{ => scripts}/shell_valid3.stderr.exp | 0 none/tests/{ => scripts}/shell_valid3.vgtest | 0 none/tests/{ => scripts}/shell_valid4 | 0 .../{ => scripts}/shell_valid4.stderr.exp | 0 .../{ => scripts}/shell_valid4.stdout.exp | 0 none/tests/{ => scripts}/shell_valid4.vgtest | 0 none/tests/{ => scripts}/shell_zerolength | 0 .../{ => scripts}/shell_zerolength.stderr.exp | 0 .../shell_zerolength.stderr.exp-dash | 0 .../{ => scripts}/shell_zerolength.vgtest | 0 none/tests/shell_dir.vgtest | 1 - 45 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 none/tests/scripts/Makefile.am rename none/tests/{ => scripts}/bug231357.stderr.exp (100%) rename none/tests/{ => scripts}/bug231357.stdout.exp (100%) rename none/tests/{ => scripts}/bug231357.vgtest (100%) rename none/tests/{ => scripts}/filter_linenos (100%) rename none/tests/{ => scripts}/filter_shell_output (100%) create mode 100755 none/tests/scripts/filter_stderr rename none/tests/{ => scripts}/shell (100%) rename none/tests/{ => scripts}/shell.stderr.exp (100%) rename none/tests/{ => scripts}/shell.stderr.exp-dash (100%) rename none/tests/{ => scripts}/shell.stderr.exp-dash2 (100%) rename none/tests/{ => scripts}/shell.stdout.exp (100%) rename none/tests/{ => scripts}/shell.vgtest (51%) rename none/tests/{ => scripts}/shell_badinterp (100%) rename none/tests/{ => scripts}/shell_badinterp.stderr.exp (100%) rename none/tests/{ => scripts}/shell_badinterp.vgtest (66%) rename none/tests/{ => scripts}/shell_binaryfile (100%) rename none/tests/{ => scripts}/shell_binaryfile.stderr.exp (100%) rename none/tests/{ => scripts}/shell_binaryfile.vgtest (67%) rename none/tests/{ => scripts}/shell_dir.stderr.exp (100%) create mode 100644 none/tests/scripts/shell_dir.vgtest rename none/tests/{ => scripts}/shell_nonexec.stderr.exp (100%) rename none/tests/{ => scripts}/shell_nonexec.vgtest (63%) rename none/tests/{ => scripts}/shell_nosuchfile.stderr.exp (100%) rename none/tests/{ => scripts}/shell_nosuchfile.vgtest (67%) rename none/tests/{ => scripts}/shell_valid1 (100%) rename none/tests/{ => scripts}/shell_valid1.stderr.exp (100%) rename none/tests/{ => scripts}/shell_valid1.vgtest (100%) rename none/tests/{ => scripts}/shell_valid2 (100%) rename none/tests/{ => scripts}/shell_valid2.stderr.exp (100%) rename none/tests/{ => scripts}/shell_valid2.vgtest (100%) rename none/tests/{ => scripts}/shell_valid3 (100%) rename none/tests/{ => scripts}/shell_valid3.stderr.exp (100%) rename none/tests/{ => scripts}/shell_valid3.vgtest (100%) rename none/tests/{ => scripts}/shell_valid4 (100%) rename none/tests/{ => scripts}/shell_valid4.stderr.exp (100%) rename none/tests/{ => scripts}/shell_valid4.stdout.exp (100%) rename none/tests/{ => scripts}/shell_valid4.vgtest (100%) rename none/tests/{ => scripts}/shell_zerolength (100%) rename none/tests/{ => scripts}/shell_zerolength.stderr.exp (100%) rename none/tests/{ => scripts}/shell_zerolength.stderr.exp-dash (100%) rename none/tests/{ => scripts}/shell_zerolength.vgtest (100%) delete mode 100644 none/tests/shell_dir.vgtest diff --git a/configure.ac b/configure.ac index e731af9ad5..a9d23108a0 100644 --- a/configure.ac +++ b/configure.ac @@ -2998,6 +2998,7 @@ AC_CONFIG_FILES([ lackey/tests/Makefile none/Makefile none/tests/Makefile + none/tests/scripts/Makefile none/tests/amd64/Makefile none/tests/ppc32/Makefile none/tests/ppc64/Makefile diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am index 7b346c6c9d..c56137ef19 100644 --- a/none/tests/Makefile.am +++ b/none/tests/Makefile.am @@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.tool-tests.am SUBDIRS = . +SUBDIRS += scripts # Arch-specific tests. if VGCONF_ARCHS_INCLUDE_X86 @@ -46,16 +47,14 @@ SUBDIRS += x86-linux endif DIST_SUBDIRS = x86 amd64 ppc32 ppc64 arm arm64 s390x mips32 mips64 \ - linux darwin x86-linux . + linux darwin x86-linux scripts . dist_noinst_SCRIPTS = \ filter_cmdline0 \ filter_cmdline1 \ filter_fdleak \ filter_ioctl_moans \ - filter_linenos \ filter_none_discards \ - filter_shell_output \ filter_stderr \ filter_timestamp \ allexec_prepare_prereq @@ -71,7 +70,6 @@ EXTRA_DIST = \ bigcode.vgtest bigcode.stderr.exp bigcode.stdout.exp \ bitfield1.stderr.exp bitfield1.vgtest \ bug129866.vgtest bug129866.stderr.exp bug129866.stdout.exp \ - bug231357.vgtest bug231357.stderr.exp bug231357.stdout.exp \ closeall.stderr.exp closeall.vgtest \ cmdline0.stderr.exp cmdline0.stdout.exp cmdline0.vgtest \ cmdline1.stderr.exp cmdline1.stdout.exp cmdline1.vgtest \ @@ -150,19 +148,6 @@ EXTRA_DIST = \ selfrun.stderr.exp selfrun.stdout.exp selfrun.vgtest \ sem.stderr.exp sem.stdout.exp sem.vgtest \ semlimit.stderr.exp semlimit.stdout.exp semlimit.vgtest \ - shell shell.vgtest shell.stderr.exp shell.stderr.exp-dash \ - shell.stdout.exp shell.stderr.exp-dash2 \ - shell_badinterp shell_badinterp.vgtest shell_badinterp.stderr.exp \ - shell_binaryfile shell_binaryfile.vgtest shell_binaryfile.stderr.exp \ - shell_dir.vgtest shell_dir.stderr.exp \ - shell_nonexec.vgtest shell_nonexec.stderr.exp \ - shell_nosuchfile.vgtest shell_nosuchfile.stderr.exp \ - shell_valid1 shell_valid1.vgtest shell_valid1.stderr.exp \ - shell_valid2 shell_valid2.vgtest shell_valid2.stderr.exp \ - shell_valid3 shell_valid3.vgtest shell_valid3.stderr.exp \ - shell_valid4 shell_valid4.vgtest shell_valid4.stderr.exp shell_valid4.stdout.exp \ - shell_zerolength shell_zerolength.vgtest shell_zerolength.stderr.exp \ - shell_zerolength.stderr.exp-dash \ sha1_test.stderr.exp sha1_test.vgtest \ shortpush.stderr.exp shortpush.vgtest \ shorts.stderr.exp shorts.vgtest \ diff --git a/none/tests/scripts/Makefile.am b/none/tests/scripts/Makefile.am new file mode 100644 index 0000000000..8ff5b8821d --- /dev/null +++ b/none/tests/scripts/Makefile.am @@ -0,0 +1,24 @@ + +include $(top_srcdir)/Makefile.tool-tests.am + +dist_noinst_SCRIPTS = \ + filter_linenos \ + filter_shell_output \ + filter_stderr + +EXTRA_DIST = \ + bug231357.vgtest bug231357.stderr.exp bug231357.stdout.exp \ + shell shell.vgtest shell.stderr.exp shell.stderr.exp-dash \ + shell.stdout.exp shell.stderr.exp-dash2 \ + shell_badinterp shell_badinterp.vgtest shell_badinterp.stderr.exp \ + shell_binaryfile shell_binaryfile.vgtest shell_binaryfile.stderr.exp \ + shell_dir.vgtest shell_dir.stderr.exp \ + shell_nonexec.vgtest shell_nonexec.stderr.exp \ + shell_nosuchfile.vgtest shell_nosuchfile.stderr.exp \ + shell_valid1 shell_valid1.vgtest shell_valid1.stderr.exp \ + shell_valid2 shell_valid2.vgtest shell_valid2.stderr.exp \ + shell_valid3 shell_valid3.vgtest shell_valid3.stderr.exp \ + shell_valid4 shell_valid4.vgtest shell_valid4.stderr.exp \ + shell_valid4.stdout.exp \ + shell_zerolength shell_zerolength.vgtest shell_zerolength.stderr.exp \ + shell_zerolength.stderr.exp-dash diff --git a/none/tests/bug231357.stderr.exp b/none/tests/scripts/bug231357.stderr.exp similarity index 100% rename from none/tests/bug231357.stderr.exp rename to none/tests/scripts/bug231357.stderr.exp diff --git a/none/tests/bug231357.stdout.exp b/none/tests/scripts/bug231357.stdout.exp similarity index 100% rename from none/tests/bug231357.stdout.exp rename to none/tests/scripts/bug231357.stdout.exp diff --git a/none/tests/bug231357.vgtest b/none/tests/scripts/bug231357.vgtest similarity index 100% rename from none/tests/bug231357.vgtest rename to none/tests/scripts/bug231357.vgtest diff --git a/none/tests/filter_linenos b/none/tests/scripts/filter_linenos similarity index 100% rename from none/tests/filter_linenos rename to none/tests/scripts/filter_linenos diff --git a/none/tests/filter_shell_output b/none/tests/scripts/filter_shell_output similarity index 100% rename from none/tests/filter_shell_output rename to none/tests/scripts/filter_shell_output diff --git a/none/tests/scripts/filter_stderr b/none/tests/scripts/filter_stderr new file mode 100755 index 0000000000..f97ddb75f9 --- /dev/null +++ b/none/tests/scripts/filter_stderr @@ -0,0 +1,8 @@ +#! /bin/sh + +dir=`dirname $0` + +$dir/../../../tests/filter_stderr_basic | + +# Anonymise addresses +$dir/../../../tests/filter_addresses diff --git a/none/tests/shell b/none/tests/scripts/shell similarity index 100% rename from none/tests/shell rename to none/tests/scripts/shell diff --git a/none/tests/shell.stderr.exp b/none/tests/scripts/shell.stderr.exp similarity index 100% rename from none/tests/shell.stderr.exp rename to none/tests/scripts/shell.stderr.exp diff --git a/none/tests/shell.stderr.exp-dash b/none/tests/scripts/shell.stderr.exp-dash similarity index 100% rename from none/tests/shell.stderr.exp-dash rename to none/tests/scripts/shell.stderr.exp-dash diff --git a/none/tests/shell.stderr.exp-dash2 b/none/tests/scripts/shell.stderr.exp-dash2 similarity index 100% rename from none/tests/shell.stderr.exp-dash2 rename to none/tests/scripts/shell.stderr.exp-dash2 diff --git a/none/tests/shell.stdout.exp b/none/tests/scripts/shell.stdout.exp similarity index 100% rename from none/tests/shell.stdout.exp rename to none/tests/scripts/shell.stdout.exp diff --git a/none/tests/shell.vgtest b/none/tests/scripts/shell.vgtest similarity index 51% rename from none/tests/shell.vgtest rename to none/tests/scripts/shell.vgtest index 5236f5debe..6deca1f01e 100644 --- a/none/tests/shell.vgtest +++ b/none/tests/scripts/shell.vgtest @@ -1,3 +1,5 @@ +prereq: rm -rf ./x86 && mkdir x86 prog: shell stderr_filter: filter_shell_output vgopts: -q +cleanup: rm -rf x86 diff --git a/none/tests/shell_badinterp b/none/tests/scripts/shell_badinterp similarity index 100% rename from none/tests/shell_badinterp rename to none/tests/scripts/shell_badinterp diff --git a/none/tests/shell_badinterp.stderr.exp b/none/tests/scripts/shell_badinterp.stderr.exp similarity index 100% rename from none/tests/shell_badinterp.stderr.exp rename to none/tests/scripts/shell_badinterp.stderr.exp diff --git a/none/tests/shell_badinterp.vgtest b/none/tests/scripts/shell_badinterp.vgtest similarity index 66% rename from none/tests/shell_badinterp.vgtest rename to none/tests/scripts/shell_badinterp.vgtest index ec04ecfd4c..6eab4d07c6 100644 --- a/none/tests/shell_badinterp.vgtest +++ b/none/tests/scripts/shell_badinterp.vgtest @@ -1 +1,2 @@ prog: shell_badinterp +vgopts: -q diff --git a/none/tests/shell_binaryfile b/none/tests/scripts/shell_binaryfile similarity index 100% rename from none/tests/shell_binaryfile rename to none/tests/scripts/shell_binaryfile diff --git a/none/tests/shell_binaryfile.stderr.exp b/none/tests/scripts/shell_binaryfile.stderr.exp similarity index 100% rename from none/tests/shell_binaryfile.stderr.exp rename to none/tests/scripts/shell_binaryfile.stderr.exp diff --git a/none/tests/shell_binaryfile.vgtest b/none/tests/scripts/shell_binaryfile.vgtest similarity index 67% rename from none/tests/shell_binaryfile.vgtest rename to none/tests/scripts/shell_binaryfile.vgtest index 113d172594..67a276ce31 100644 --- a/none/tests/shell_binaryfile.vgtest +++ b/none/tests/scripts/shell_binaryfile.vgtest @@ -1 +1,2 @@ prog: shell_binaryfile +vgopts: -q diff --git a/none/tests/shell_dir.stderr.exp b/none/tests/scripts/shell_dir.stderr.exp similarity index 100% rename from none/tests/shell_dir.stderr.exp rename to none/tests/scripts/shell_dir.stderr.exp diff --git a/none/tests/scripts/shell_dir.vgtest b/none/tests/scripts/shell_dir.vgtest new file mode 100644 index 0000000000..6ef444f30b --- /dev/null +++ b/none/tests/scripts/shell_dir.vgtest @@ -0,0 +1,4 @@ +prereq: rm -rf ./x86 && mkdir x86 +prog: x86/ +vgopts: -q +cleanup: rm -rf ./x86 diff --git a/none/tests/shell_nonexec.stderr.exp b/none/tests/scripts/shell_nonexec.stderr.exp similarity index 100% rename from none/tests/shell_nonexec.stderr.exp rename to none/tests/scripts/shell_nonexec.stderr.exp diff --git a/none/tests/shell_nonexec.vgtest b/none/tests/scripts/shell_nonexec.vgtest similarity index 63% rename from none/tests/shell_nonexec.vgtest rename to none/tests/scripts/shell_nonexec.vgtest index 8bd76557f4..258f6affc5 100644 --- a/none/tests/shell_nonexec.vgtest +++ b/none/tests/scripts/shell_nonexec.vgtest @@ -1 +1,2 @@ prog: shell.vgtest +vgopts: -q diff --git a/none/tests/shell_nosuchfile.stderr.exp b/none/tests/scripts/shell_nosuchfile.stderr.exp similarity index 100% rename from none/tests/shell_nosuchfile.stderr.exp rename to none/tests/scripts/shell_nosuchfile.stderr.exp diff --git a/none/tests/shell_nosuchfile.vgtest b/none/tests/scripts/shell_nosuchfile.vgtest similarity index 67% rename from none/tests/shell_nosuchfile.vgtest rename to none/tests/scripts/shell_nosuchfile.vgtest index 13d3e65c10..1202acf1f4 100644 --- a/none/tests/shell_nosuchfile.vgtest +++ b/none/tests/scripts/shell_nosuchfile.vgtest @@ -1 +1,2 @@ prog: shell_nosuchfile +vgopts: -q diff --git a/none/tests/shell_valid1 b/none/tests/scripts/shell_valid1 similarity index 100% rename from none/tests/shell_valid1 rename to none/tests/scripts/shell_valid1 diff --git a/none/tests/shell_valid1.stderr.exp b/none/tests/scripts/shell_valid1.stderr.exp similarity index 100% rename from none/tests/shell_valid1.stderr.exp rename to none/tests/scripts/shell_valid1.stderr.exp diff --git a/none/tests/shell_valid1.vgtest b/none/tests/scripts/shell_valid1.vgtest similarity index 100% rename from none/tests/shell_valid1.vgtest rename to none/tests/scripts/shell_valid1.vgtest diff --git a/none/tests/shell_valid2 b/none/tests/scripts/shell_valid2 similarity index 100% rename from none/tests/shell_valid2 rename to none/tests/scripts/shell_valid2 diff --git a/none/tests/shell_valid2.stderr.exp b/none/tests/scripts/shell_valid2.stderr.exp similarity index 100% rename from none/tests/shell_valid2.stderr.exp rename to none/tests/scripts/shell_valid2.stderr.exp diff --git a/none/tests/shell_valid2.vgtest b/none/tests/scripts/shell_valid2.vgtest similarity index 100% rename from none/tests/shell_valid2.vgtest rename to none/tests/scripts/shell_valid2.vgtest diff --git a/none/tests/shell_valid3 b/none/tests/scripts/shell_valid3 similarity index 100% rename from none/tests/shell_valid3 rename to none/tests/scripts/shell_valid3 diff --git a/none/tests/shell_valid3.stderr.exp b/none/tests/scripts/shell_valid3.stderr.exp similarity index 100% rename from none/tests/shell_valid3.stderr.exp rename to none/tests/scripts/shell_valid3.stderr.exp diff --git a/none/tests/shell_valid3.vgtest b/none/tests/scripts/shell_valid3.vgtest similarity index 100% rename from none/tests/shell_valid3.vgtest rename to none/tests/scripts/shell_valid3.vgtest diff --git a/none/tests/shell_valid4 b/none/tests/scripts/shell_valid4 similarity index 100% rename from none/tests/shell_valid4 rename to none/tests/scripts/shell_valid4 diff --git a/none/tests/shell_valid4.stderr.exp b/none/tests/scripts/shell_valid4.stderr.exp similarity index 100% rename from none/tests/shell_valid4.stderr.exp rename to none/tests/scripts/shell_valid4.stderr.exp diff --git a/none/tests/shell_valid4.stdout.exp b/none/tests/scripts/shell_valid4.stdout.exp similarity index 100% rename from none/tests/shell_valid4.stdout.exp rename to none/tests/scripts/shell_valid4.stdout.exp diff --git a/none/tests/shell_valid4.vgtest b/none/tests/scripts/shell_valid4.vgtest similarity index 100% rename from none/tests/shell_valid4.vgtest rename to none/tests/scripts/shell_valid4.vgtest diff --git a/none/tests/shell_zerolength b/none/tests/scripts/shell_zerolength similarity index 100% rename from none/tests/shell_zerolength rename to none/tests/scripts/shell_zerolength diff --git a/none/tests/shell_zerolength.stderr.exp b/none/tests/scripts/shell_zerolength.stderr.exp similarity index 100% rename from none/tests/shell_zerolength.stderr.exp rename to none/tests/scripts/shell_zerolength.stderr.exp diff --git a/none/tests/shell_zerolength.stderr.exp-dash b/none/tests/scripts/shell_zerolength.stderr.exp-dash similarity index 100% rename from none/tests/shell_zerolength.stderr.exp-dash rename to none/tests/scripts/shell_zerolength.stderr.exp-dash diff --git a/none/tests/shell_zerolength.vgtest b/none/tests/scripts/shell_zerolength.vgtest similarity index 100% rename from none/tests/shell_zerolength.vgtest rename to none/tests/scripts/shell_zerolength.vgtest diff --git a/none/tests/shell_dir.vgtest b/none/tests/shell_dir.vgtest deleted file mode 100644 index 366f5c8802..0000000000 --- a/none/tests/shell_dir.vgtest +++ /dev/null @@ -1 +0,0 @@ -prog: x86/ -- 2.47.3