Moved drd/tests/pth_barrier.c, drd/tests/rwlock_race.c and

drd/tests/rwlock_test.c back to their original location.

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

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 630b4c92fd74be9ffb0bc37b4178172ef25daff4..e397327536633ea5e53e2673fe8ba5469dc5f5ad 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -203,6 +203,8 @@ check_PROGRAMS =      \
   memory_allocation   \
   monitor_example     \
   new_delete          \
+  rwlock_race         \
+  rwlock_test         \
   pth_broadcast       \
   pth_cancel_locked   \
   pth_cond_race       \
@@ -224,7 +226,7 @@ check_PROGRAMS += omp_matinv omp_prime omp_printf
 endif
 
 if HAVE_PTHREAD_BARRIER
-check_PROGRAMS += matinv pth_barrier_reinit
+check_PROGRAMS += matinv pth_barrier pth_barrier_reinit
 endif
 
 if HAVE_PTHREAD_SPINLOCK

diff --git a/helgrind/tests/pth_barrier.c b/drd/tests/pth_barrier.c
similarity index 100%
rename from helgrind/tests/pth_barrier.c
rename to drd/tests/pth_barrier.c

diff --git a/drd/tests/pth_barrier.vgtest b/drd/tests/pth_barrier.vgtest
index 3f15c0e73b861715943500362f70b3e1bd232670..adc781d14254986ea6db53d5849c8d1fedecc6ac 100644 (file)
--- a/drd/tests/pth_barrier.vgtest
+++ b/drd/tests/pth_barrier.vgtest
@@ -1,4 +1,4 @@
-prereq: test -e ../../helgrind/tests/pth_barrier && ./supported_libpthread
-prog: ../../helgrind/tests/pth_barrier
+prereq: test -e pth_barrier && ./supported_libpthread
+prog: pth_barrier
 args: 2 1 1
 stderr_filter: filter_error_summary

diff --git a/drd/tests/pth_barrier2.vgtest b/drd/tests/pth_barrier2.vgtest
index bedb84161d94984b76e5f3d8166b437e652bb90c..1fe94089a69bfda2d6f288b9e333f5767934169d 100644 (file)
--- a/drd/tests/pth_barrier2.vgtest
+++ b/drd/tests/pth_barrier2.vgtest
@@ -1,4 +1,4 @@
-prereq: test -e ../../helgrind/tests/pth_barrier && ./supported_libpthread
-prog: ../../helgrind/tests/pth_barrier
+prereq: test -e pth_barrier && ./supported_libpthread
+prog: pth_barrier
 args: 2 32 1
 stderr_filter: filter_error_summary

diff --git a/drd/tests/pth_barrier3.vgtest b/drd/tests/pth_barrier3.vgtest
index 562866e49bd866845bff2348933fece9952c917b..c17edb19a07a449c8f6633d594946418be0d7cbb 100644 (file)
--- a/drd/tests/pth_barrier3.vgtest
+++ b/drd/tests/pth_barrier3.vgtest
@@ -1,4 +1,4 @@
-prereq: test -e ../../helgrind/tests/pth_barrier && ./supported_libpthread
-prog: ../../helgrind/tests/pth_barrier
+prereq: test -e pth_barrier && ./supported_libpthread
+prog: pth_barrier
 args: 32 1 1
 stderr_filter: filter_error_summary

diff --git a/helgrind/tests/rwlock_race.c b/drd/tests/rwlock_race.c
similarity index 100%
rename from helgrind/tests/rwlock_race.c
rename to drd/tests/rwlock_race.c

diff --git a/drd/tests/rwlock_race.vgtest b/drd/tests/rwlock_race.vgtest
index 5a76b2c0f1e99dc76d3e3d2c6ab6cfd6c8d18a64..856138b2b7e85e21ad6b585a561c7bfc9108aec7 100644 (file)
--- a/drd/tests/rwlock_race.vgtest
+++ b/drd/tests/rwlock_race.vgtest
@@ -1,3 +1,3 @@
 prereq: ./supported_libpthread
 vgopts: --var-info=yes
-prog: ../../helgrind/tests/rwlock_race
+prog: rwlock_race

diff --git a/helgrind/tests/rwlock_test.c b/drd/tests/rwlock_test.c
similarity index 100%
rename from helgrind/tests/rwlock_test.c
rename to drd/tests/rwlock_test.c

diff --git a/drd/tests/rwlock_test.vgtest b/drd/tests/rwlock_test.vgtest
index 2188dc6a577513efb95e5210cee4542d9c16daa6..6ce02632662d7627a7b7e0d8ab0be6feed4ad90a 100644 (file)
--- a/drd/tests/rwlock_test.vgtest
+++ b/drd/tests/rwlock_test.vgtest
@@ -1 +1 @@
-prog: ../../helgrind/tests/rwlock_test
+prog: rwlock_test

diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index 23d84428e2fda335fbd03cc8e56a994ba41ae86c..6ffecd8b1ced742625077c1849605d5144749057 100644 (file)
--- a/helgrind/tests/Makefile.am
+++ b/helgrind/tests/Makefile.am
@@ -126,8 +126,6 @@ check_PROGRAMS = \
        hg04_race \
        hg05_race2 \
        hg06_readshared \
-       rwlock_race \
-       rwlock_test \
        tc01_simple_race \
        tc02_simple_tls \
        tc03_re_excl \
@@ -154,7 +152,7 @@ check_PROGRAMS = \
        tc24_nonzero_sem
 
 if HAVE_PTHREAD_BARRIER
-check_PROGRAMS += bar_bad bar_trivial pth_barrier
+check_PROGRAMS += bar_bad bar_trivial
 endif
 
 

diff --git a/helgrind/tests/pth_barrier1.vgtest b/helgrind/tests/pth_barrier1.vgtest
index f28eb6674b03ce2fe147002c6a26fd466147549c..7b0d62f1c1f143c7ebb6e2bccf877b82e28ab29a 100644 (file)
--- a/helgrind/tests/pth_barrier1.vgtest
+++ b/helgrind/tests/pth_barrier1.vgtest
@@ -1,4 +1,4 @@
 prereq: test -e bar_trivial
-prog: pth_barrier
+prog: ../../drd/tests/pth_barrier
 args: 2 1 1
 vgopts: -q

diff --git a/helgrind/tests/pth_barrier2.vgtest b/helgrind/tests/pth_barrier2.vgtest
index d9bb01aa7df87a4e30ea99359f12749918700265..13036b39c489555743804ad78cc9cee6d13095a3 100644 (file)
--- a/helgrind/tests/pth_barrier2.vgtest
+++ b/helgrind/tests/pth_barrier2.vgtest
@@ -1,4 +1,4 @@
 prereq: test -e bar_trivial
-prog: pth_barrier
+prog: ../../drd/tests/pth_barrier
 args: 2 32 1
 vgopts: -q --cmp-race-err-addrs=yes

diff --git a/helgrind/tests/pth_barrier3.vgtest b/helgrind/tests/pth_barrier3.vgtest
index d17e7824f7972cb17ff4922f48d6a693b727e338..06ab6c353cf1ee984fdcdfca9dc2a516d077fb97 100644 (file)
--- a/helgrind/tests/pth_barrier3.vgtest
+++ b/helgrind/tests/pth_barrier3.vgtest
@@ -1,4 +1,4 @@
 prereq: test -e bar_trivial
-prog: pth_barrier
+prog: ../../drd/tests/pth_barrier
 args: 32 1 1
 vgopts: -q

diff --git a/helgrind/tests/rwlock_race.vgtest b/helgrind/tests/rwlock_race.vgtest
index a7be2050931aba1a0a8003c13e2f65953d3c6d4f..00b462f2c0d88fcb910874b84a36dcb2fbdecf4b 100644 (file)
--- a/helgrind/tests/rwlock_race.vgtest
+++ b/helgrind/tests/rwlock_race.vgtest
@@ -1,2 +1,2 @@
-prog: rwlock_race
+prog: ../../drd/tests/rwlock_race
 vgopts: --read-var-info=yes

diff --git a/helgrind/tests/rwlock_test.vgtest b/helgrind/tests/rwlock_test.vgtest
index 6ce02632662d7627a7b7e0d8ab0be6feed4ad90a..4257fc9cfa28ae9883c3d416fe84a48ccc2c0f1d 100644 (file)
--- a/helgrind/tests/rwlock_test.vgtest
+++ b/helgrind/tests/rwlock_test.vgtest
@@ -1 +1 @@
-prog: rwlock_test
+prog: ../../drd/tests/rwlock_test