First round of changes to get make dist working again.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12131

diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index 76691b35948056f899c6c17270b81e505717cb60..5412a747e850bbb776f2c9f070fa7f635a468f6b 100644 (file)
--- a/helgrind/tests/Makefile.am
+++ b/helgrind/tests/Makefile.am
@@ -56,7 +56,7 @@ EXTRA_DIST = \
        tc07_hbl1.vgtest tc07_hbl1.stdout.exp tc07_hbl1.stderr.exp \
        tc08_hbl2.vgtest tc08_hbl2.stdout.exp tc08_hbl2.stderr.exp \
        tc09_bad_unlock.vgtest tc09_bad_unlock.stdout.exp \
-               tc09_bad_unlock.stderr.exp-glibc25-amd64 \
+               tc09_bad_unlock.stderr.exp \
        tc10_rec_lock.vgtest tc10_rec_lock.stdout.exp tc10_rec_lock.stderr.exp \
        tc11_XCHG.vgtest tc11_XCHG.stdout.exp tc11_XCHG.stderr.exp \
        tc12_rwl_trivial.vgtest tc12_rwl_trivial.stdout.exp \
@@ -72,11 +72,11 @@ EXTRA_DIST = \
        tc17_sembar.vgtest tc17_sembar.stdout.exp \
                tc17_sembar.stderr.exp \
        tc18_semabuse.vgtest tc18_semabuse.stdout.exp \
-               tc18_semabuse.stderr.exp-glibc28-amd64 \
+               tc18_semabuse.stderr.exp \
        tc19_shadowmem.vgtest tc19_shadowmem.stdout.exp \
                tc19_shadowmem.stderr.exp \
        tc20_verifywrap.vgtest tc20_verifywrap.stdout.exp \
-               tc20_verifywrap.stderr.exp-glibc27-amd64 \
+               tc20_verifywrap.stderr.exp \
        tc21_pthonce.vgtest tc21_pthonce.stdout.exp tc21_pthonce.stderr.exp \
        tc22_exit_w_lock.vgtest tc22_exit_w_lock.stdout.exp \
                tc22_exit_w_lock.stderr.exp \

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index a8a61805e34867633229b322d3556408f9f6b83c..8fd441e152fddfe3f0b8f07cc080554e21355b95 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -56,35 +56,35 @@ EXTRA_DIST = \
        badfree3.stderr.exp badfree3.vgtest \
        badjump.stderr.exp badjump.vgtest \
        badjump2.stderr.exp badjump2.vgtest \
-       badjump.stderr.exp-s390x \
-       badjump2.stderr.exp-s390x \
+       badjump.stderr.exp-kfail \
+       badjump2.stderr.exp-kfail \
        badloop.stderr.exp badloop.vgtest \
        badpoll.stderr.exp badpoll.vgtest \
-       badrw.stderr.exp badrw.vgtest \
+       badrw.stderr.exp badrw.vgtest badrw.stderr.exp-s390x-mvc \
        brk2.stderr.exp brk2.vgtest \
-       buflen_check.stderr.exp buflen_check.vgtest \
+       buflen_check.stderr.exp buflen_check.vgtest buflen_check.stderr.exp-kfail \
        calloc-overflow.stderr.exp calloc-overflow.vgtest\
        clientperm.stderr.exp \
        clientperm.stdout.exp clientperm.vgtest \
-       custom_alloc.stderr.exp custom_alloc.vgtest \
+       custom_alloc.stderr.exp custom_alloc.vgtest custom_alloc.stderr.exp-s390x-mvc \
        custom-overlap.stderr.exp custom-overlap.vgtest \
        deep_templates.vgtest \
        deep_templates.stdout.exp deep_templates.stderr.exp \
        describe-block.stderr.exp describe-block.vgtest \
        doublefree.stderr.exp doublefree.vgtest \
-       err_disable1.vgtest err_disable1.stderr.exp err_disable1.stdout.exp \
-       err_disable2.vgtest err_disable2.stderr.exp err_disable2.stdout.exp \
-       err_disable3.vgtest err_disable3.stderr.exp err_disable3.stdout.exp \
-       err_disable4.vgtest err_disable4.stderr.exp err_disable4.stdout.exp \
+       err_disable1.vgtest err_disable1.stderr.exp \
+       err_disable2.vgtest err_disable2.stderr.exp \
+       err_disable3.vgtest err_disable3.stderr.exp \
+       err_disable4.vgtest err_disable4.stderr.exp \
        erringfds.stderr.exp erringfds.stdout.exp erringfds.vgtest \
        error_counts.stderr.exp error_counts.vgtest \
        errs1.stderr.exp errs1.vgtest \
        exitprog.stderr.exp exitprog.vgtest \
-       execve1.stderr.exp execve1.vgtest \
-       execve2.stderr.exp execve2.vgtest \
+       execve1.stderr.exp execve1.vgtest execve1.stderr.exp-kfail \
+       execve2.stderr.exp execve2.vgtest execve2.stderr.exp-kfail \
        file_locking.stderr.exp file_locking.vgtest \
        fprw.stderr.exp fprw.vgtest \
-       fwrite.stderr.exp fwrite.vgtest \
+       fwrite.stderr.exp fwrite.vgtest fwrite.stderr.exp-kfail \
        inits.stderr.exp inits.vgtest \
        inline.stderr.exp inline.stdout.exp inline.vgtest \
        leak-0.vgtest leak-0.stderr.exp \
@@ -141,6 +141,7 @@ EXTRA_DIST = \
        origin5-bz2.stderr.exp-glibc25-amd64 \
        origin5-bz2.stderr.exp-glibc27-ppc64 \
        origin5-bz2.stderr.exp-glibc212-s390x \
+       origin5-bz2.stderr.exp-glibc234-s390x \
        origin6-fp.vgtest origin6-fp.stdout.exp \
        origin6-fp.stderr.exp-glibc25-amd64 \
        origin6-fp.stderr.exp-glibc27-ppc64 \
@@ -152,6 +153,7 @@ EXTRA_DIST = \
        partiallydefinedeq.stdout.exp \
        partial_load_ok.vgtest partial_load_ok.stderr.exp partial_load_ok.stderr.exp64 \
        partial_load_dflt.vgtest partial_load_dflt.stderr.exp partial_load_dflt.stderr.exp64 \
+       partial_load_dflt.stderr.expr-s390x-mvc \
        pdb-realloc.stderr.exp pdb-realloc.vgtest \
        pdb-realloc2.stderr.exp pdb-realloc2.stdout.exp pdb-realloc2.vgtest \
        pipe.stderr.exp pipe.vgtest \
@@ -174,12 +176,12 @@ EXTRA_DIST = \
        str_tester.stderr.exp str_tester.vgtest \
        supp-dir.vgtest supp-dir.stderr.exp \
        supp_unknown.stderr.exp supp_unknown.vgtest supp_unknown.supp \
-       supp_unknown.stderr.exp-s390x \
+       supp_unknown.stderr.exp-kfail \
        supp1.stderr.exp supp1.vgtest \
        supp2.stderr.exp supp2.vgtest \
        supp.supp \
        suppfree.stderr.exp suppfree.vgtest \
-       trivialleak.stderr.exp trivialleak.vgtest \
+       trivialleak.stderr.exp trivialleak.vgtest trivialleak.stderr.exp2 \
        unit_libcbase.stderr.exp unit_libcbase.vgtest \
        unit_oset.stderr.exp unit_oset.stdout.exp unit_oset.vgtest \
        varinfo1.vgtest varinfo1.stdout.exp varinfo1.stderr.exp varinfo1.stderr.exp-ppc64\
@@ -202,7 +204,7 @@ EXTRA_DIST = \
        wrap8.vgtest wrap8.stdout.exp wrap8.stderr.exp \
        wrap8.stdout.exp2 wrap8.stderr.exp2 \
        writev1.stderr.exp writev1.vgtest \
-       xml1.stderr.exp xml1.stdout.exp xml1.vgtest
+       xml1.stderr.exp xml1.stdout.exp xml1.vgtest xml1.stderr.exp-s390x-mvc
 
 check_PROGRAMS = \
        addressable \

diff --git a/none/tests/Makefile.am b/none/tests/Makefile.am
index 4b1c117c3887315a39f50ae53ccb9e8063e73cd8..839548d9c26abede2395a3eead6dae9507546348 100644 (file)
--- a/none/tests/Makefile.am
+++ b/none/tests/Makefile.am
@@ -73,7 +73,7 @@ EXTRA_DIST = \
        exec-sigmask.vgtest exec-sigmask.stdout.exp \
        exec-sigmask.stdout.exp2 exec-sigmask.stdout.exp3 exec-sigmask.stderr.exp \
        execve.vgtest execve.stdout.exp execve.stderr.exp \
-       faultstatus.vgtest faultstatus.stderr.exp \
+       faultstatus.vgtest faultstatus.stderr.exp faultstatus.stderr.exp-s390x \
        fcntl_setown.vgtest fcntl_setown.stdout.exp fcntl_setown.stderr.exp \
        fdleak_cmsg.stderr.exp fdleak_cmsg.vgtest \
        fdleak_creat.stderr.exp fdleak_creat.vgtest \

diff --git a/none/tests/amd64/Makefile.am b/none/tests/amd64/Makefile.am
index 2770cd42e4cae7d9c200c7ba35aecb7598fb103a..75a3efaa325c98e062e24e13a60bd9e53fd50dbb 100644 (file)
--- a/none/tests/amd64/Makefile.am
+++ b/none/tests/amd64/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = \
        bug137714-amd64.vgtest bug137714-amd64.stdout.exp \
        bug137714-amd64.stderr.exp \
        bug132918.vgtest bug132918.stderr.exp bug132918.stdout.exp \
-       bug132918.stdout.out-older-glibc \
+       bug132918.stdout.exp-older-glibc \
        bug156404-amd64.vgtest bug156404-amd64.stdout.exp \
        bug156404-amd64.stderr.exp \
        clc.vgtest clc.stdout.exp clc.stderr.exp \

diff --git a/none/tests/s390x/Makefile.am b/none/tests/s390x/Makefile.am
index 5c269dedc4aca0876af78e0c881bc93204cb5677..95b20048a2acdc2974447b4c4f384e98a3cb74f8 100644 (file)
--- a/none/tests/s390x/Makefile.am
+++ b/none/tests/s390x/Makefile.am
@@ -5,11 +5,12 @@ dist_noinst_SCRIPTS = filter_stderr
 INSN_TESTS = clc clcle cvb cvd icm lpr tcxb lam_stam xc mvst add sub mul \
              and or xor insert div srst fold_And16 flogr sub_EI add_EI \
              and_EI or_EI xor_EI insert_EI mul_GE add_GE condloadstore \
-             op_exception fgx stck stckf stcke stfle op00 cksm mvcl clcl
+             op_exception fgx stck stckf stcke stfle cksm mvcl clcl
 
 check_PROGRAMS = $(INSN_TESTS) \
                 ex_sig \
-                ex_clone
+                ex_clone \
+                op00
 
 EXTRA_DIST = \
        $(addsuffix .stderr.exp,$(INSN_TESTS)) \
@@ -17,6 +18,7 @@ EXTRA_DIST = \
        $(addsuffix .vgtest,$(INSN_TESTS)) \
        ex_sig.stdout.exp ex_sig.stderr.exp ex_sig.vgtest \
        ex_clone.stdout.exp ex_clone.stderr.exp ex_clone.vgtest \
+       op00.stderr.exp1 op00.stderr.exp2 op00.vgtest \
        test.h opcodes.h add.h  and.h  div.h  insert.h \
        mul.h  or.h  sub.h  test.h  xor.h