Back out r16425, since that was merged in the wrong order. It is:

  Merge from trunk, r16422 (Connect cet_nops test cases with other OSes)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_13_BRANCH@16426

diff --git a/none/tests/amd64-darwin/Makefile.am b/none/tests/amd64-darwin/Makefile.am
index 260221ffb866bf4e2519e847d484a96c8ea122e2..b231b30fcbeaa19fb7f8e4c00121690a2eb22bac 100644 (file)
--- a/none/tests/amd64-darwin/Makefile.am
+++ b/none/tests/amd64-darwin/Makefile.am
@@ -5,12 +5,10 @@ dist_noinst_SCRIPTS = \
        filter_stderr filter_minimal
 
 EXTRA_DIST = \
-       bug341419.vgtest bug341419.stderr.exp \
-       cet_nops_gs.stderr.exp cet_nops_gs.stdout.exp cet_nops_gs.vgtest
+       bug341419.vgtest bug341419.stderr.exp
 
 check_PROGRAMS = \
-       bug341419 \
-       cet_nops_gs
+       bug341419
 
 AM_CFLAGS    += @FLAG_M64@
 AM_CXXFLAGS  += @FLAG_M64@

diff --git a/none/tests/amd64-darwin/cet_nops_gs.c b/none/tests/amd64-darwin/cet_nops_gs.c
deleted file mode 120000 (symlink)
index bc95f04..0000000
--- a/none/tests/amd64-darwin/cet_nops_gs.c
+++ /dev/null
@@ -1 +0,0 @@
-../amd64-linux/cet_nops_gs.c
\ No newline at end of file

diff --git a/none/tests/amd64-darwin/cet_nops_gs.stderr.exp b/none/tests/amd64-darwin/cet_nops_gs.stderr.exp
deleted file mode 120000 (symlink)
index 11324e9..0000000
--- a/none/tests/amd64-darwin/cet_nops_gs.stderr.exp
+++ /dev/null
@@ -1 +0,0 @@
-../amd64-linux/cet_nops_gs.stderr.exp
\ No newline at end of file

diff --git a/none/tests/amd64-darwin/cet_nops_gs.stdout.exp b/none/tests/amd64-darwin/cet_nops_gs.stdout.exp
deleted file mode 120000 (symlink)
index 5f2d0d7..0000000
--- a/none/tests/amd64-darwin/cet_nops_gs.stdout.exp
+++ /dev/null
@@ -1 +0,0 @@
-../amd64-linux/cet_nops_gs.stdout.exp
\ No newline at end of file

diff --git a/none/tests/amd64-darwin/cet_nops_gs.vgtest b/none/tests/amd64-darwin/cet_nops_gs.vgtest
deleted file mode 120000 (symlink)
index fe931db..0000000
--- a/none/tests/amd64-darwin/cet_nops_gs.vgtest
+++ /dev/null
@@ -1 +0,0 @@
-../amd64-linux/cet_nops_gs.vgtest
\ No newline at end of file

diff --git a/none/tests/amd64-solaris/Makefile.am b/none/tests/amd64-solaris/Makefile.am
index 0f5d80ab3a65a62668dd69fc8224dc1be9079efb..3830fbee0e2b7456ca99d38c07095e10fe5b4f9e 100644 (file)
--- a/none/tests/amd64-solaris/Makefile.am
+++ b/none/tests/amd64-solaris/Makefile.am
@@ -7,7 +7,6 @@ dist_noinst_SCRIPTS = \
        filter_stderr
 
 EXTRA_DIST = \
-       cet_nops_fs.stderr.exp cet_nops_fs.stdout.exp cet_nops_fs.vgtest \
        coredump_single_thread.post.exp coredump_single_thread.stderr.exp \
        coredump_single_thread.stdout.exp coredump_single_thread.vgtest \
        coredump_single_thread_sse.post.exp coredump_single_thread_sse.stderr.exp \
@@ -15,7 +14,6 @@ EXTRA_DIST = \
        syscall_return_args.stderr.exp syscall_return_args.vgtest
 
 check_PROGRAMS = \
-       cet_nops_fs \
        coredump_single_thread \
        coredump_single_thread_sse \
        syscall_return_args

diff --git a/none/tests/amd64-solaris/cet_nops_fs.c b/none/tests/amd64-solaris/cet_nops_fs.c
deleted file mode 120000 (symlink)
index 731ee83..0000000
--- a/none/tests/amd64-solaris/cet_nops_fs.c
+++ /dev/null
@@ -1 +0,0 @@
-../amd64-linux/cet_nops_fs.c
\ No newline at end of file

diff --git a/none/tests/amd64-solaris/cet_nops_fs.stderr.exp b/none/tests/amd64-solaris/cet_nops_fs.stderr.exp
deleted file mode 120000 (symlink)
index e39731a..0000000
--- a/none/tests/amd64-solaris/cet_nops_fs.stderr.exp
+++ /dev/null
@@ -1 +0,0 @@
-../amd64-linux/cet_nops_fs.stderr.exp
\ No newline at end of file

diff --git a/none/tests/amd64-solaris/cet_nops_fs.stdout.exp b/none/tests/amd64-solaris/cet_nops_fs.stdout.exp
deleted file mode 120000 (symlink)
index d81207d..0000000
--- a/none/tests/amd64-solaris/cet_nops_fs.stdout.exp
+++ /dev/null
@@ -1 +0,0 @@
-../amd64-linux/cet_nops_fs.stdout.exp
\ No newline at end of file

diff --git a/none/tests/amd64-solaris/cet_nops_fs.vgtest b/none/tests/amd64-solaris/cet_nops_fs.vgtest
deleted file mode 120000 (symlink)
index 16c58ac..0000000
--- a/none/tests/amd64-solaris/cet_nops_fs.vgtest
+++ /dev/null
@@ -1 +0,0 @@
-../amd64-linux/cet_nops_fs.vgtest
\ No newline at end of file