'make dist' fixes following s390x-linux merge. (Christian Borntraeger

<borntraeger@de.ibm.com>)

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

diff --git a/Makefile.am b/Makefile.am
index 4043b8b63480421bcf501b01eb0cac6aea023169..61fddf5345ced219b2b8b3ff5d63d7e83f49110b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,6 +92,7 @@ EXTRA_DIST = \
        README_DEVELOPERS \
        README_PACKAGERS \
        README_MISSING_SYSCALL_OR_IOCTL \
+       README.s390 \
        valgrind.pc.in \
        valgrind.spec.in \
        valgrind.spec

diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am
index 1429d9ec1ebd29a7fe16c18d3986ac57612f8e8f..ba9dcfac118f19dff5601cbf0aad6a0d9f488df4 100644 (file)
--- a/memcheck/tests/Makefile.am
+++ b/memcheck/tests/Makefile.am
@@ -56,6 +56,8 @@ 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 \
        badloop.stderr.exp badloop.vgtest \
        badpoll.stderr.exp badpoll.vgtest \
        badrw.stderr.exp badrw.vgtest \
@@ -135,11 +137,14 @@ EXTRA_DIST = \
        origin5-bz2.stderr.exp-glibc25-x86 \
        origin5-bz2.stderr.exp-glibc25-amd64 \
        origin5-bz2.stderr.exp-glibc27-ppc64 \
+       origin5-bz2.stderr.exp-glibc212-s390x \
        origin6-fp.vgtest origin6-fp.stdout.exp \
        origin6-fp.stderr.exp-glibc25-amd64 \
        origin6-fp.stderr.exp-glibc27-ppc64 \
        overlap.stderr.exp overlap.stdout.exp overlap.vgtest \
        partiallydefinedeq.vgtest partiallydefinedeq.stderr.exp \
+       partiallydefinedeq.stderr.exp4 \
+       partiallydefinedeq.stderr.exp3 \
        partiallydefinedeq.stderr.exp2 \
        partiallydefinedeq.stdout.exp \
        partial_load_ok.vgtest partial_load_ok.stderr.exp partial_load_ok.stderr.exp64 \
@@ -165,6 +170,7 @@ 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 \
        supp1.stderr.exp supp1.vgtest \
        supp2.stderr.exp supp2.vgtest \
        supp.supp \

diff --git a/memcheck/tests/linux/Makefile.am b/memcheck/tests/linux/Makefile.am
index 4bd77513025ca716265b03f30ca3ab326997fff2..72f57c4d8cd8340eb52a392c45ee365bd785fb94 100644 (file)
--- a/memcheck/tests/linux/Makefile.am
+++ b/memcheck/tests/linux/Makefile.am
@@ -5,7 +5,7 @@ dist_noinst_SCRIPTS = filter_stderr
 
 EXTRA_DIST = \
        brk.stderr.exp brk.vgtest \
-       capget capget.stderr.exp \
+       capget capget.stderr.exp capget.stderr.exp2 \
        lsframe1.vgtest lsframe1.stdout.exp lsframe1.stderr.exp \
        lsframe2.vgtest lsframe2.stdout.exp lsframe2.stderr.exp \
        sigqueue.vgtest sigqueue.stderr.exp \

diff --git a/none/tests/s390x/Makefile.am b/none/tests/s390x/Makefile.am
index 6aee61b3f11841526d7eed812f3f0c19a8ada617..bda7c182b3370480a823a559f2f03a5e45fae580 100644 (file)
--- a/none/tests/s390x/Makefile.am
+++ b/none/tests/s390x/Makefile.am
@@ -19,10 +19,19 @@ check_PROGRAMS = $(INSN_TESTS) \
                 ex_clone
 
 EXTRA_DIST = \
-       $(addsuffix .stderr.exp,$(check_PROGRAMS)) \
-       $(addsuffix .stdout.exp,$(check_PROGRAMS)) \
-       $(addsuffix .vgtest,$(check_PROGRAMS)) \
-       test.h mul.h
+       $(addsuffix .stderr.exp,$(INSN_TESTS)) \
+       $(addsuffix .stdout.exp,$(INSN_TESTS)) \
+       $(addsuffix .vgtest,$(INSN_TESTS)) \
+       $(addsuffix .stderr.exp,$(INSN_EI)) \
+       $(addsuffix .stdout.exp,$(INSN_EI)) \
+       $(addsuffix .vgtest,$(INSN_EI)) \
+       $(addsuffix .stderr.exp,$(INSN_GE)) \
+       $(addsuffix .stdout.exp,$(INSN_GE)) \
+       $(addsuffix .vgtest,$(INSN_GE)) \
+       ex_sig.stdout.exp ex_sig.stderr.exp ex_sig.vgtest \
+       ex_clone.stdout.exp ex_clone.stderr.exp ex_clone.vgtest \
+       test.h add.h  and.h  div.h  insert.h \
+       mul.h  or.h  sub.h  test.h  xor.h
 
 AM_CFLAGS    += @FLAG_M64@
 AM_CXXFLAGS  += @FLAG_M64@

diff --git a/none/tests/s390x/flogr.stdout.exp b/none/tests/s390x/flogr.stdout.exp
new file mode 100644 (file)
index 0000000..e69de29