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
2026-02-03 18:13:01 +00:00 · 2009-02-20 19:00:18 +00:00 · 2009-02-20 19:00:18 +00:00 · 840f16dda7
commit 840f16dda7
parent f6b278a3fc
15 changed files with 17 additions and 17 deletions
--- 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
--- a/helgrind/tests/pth_barrier.c
+++ b/helgrind/tests/pth_barrier.c
--- 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
--- 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
--- 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
--- a/helgrind/tests/rwlock_race.c
+++ b/helgrind/tests/rwlock_race.c
--- 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
--- a/helgrind/tests/rwlock_test.c
+++ b/helgrind/tests/rwlock_test.c
--- a/drd/tests/rwlock_test.vgtest
+++ b/drd/tests/rwlock_test.vgtest
@ -1 +1 @@
-prog: ../../helgrind/tests/rwlock_test
+prog: rwlock_test
--- 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


--- 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
--- 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
--- 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
--- 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
--- a/helgrind/tests/rwlock_test.vgtest
+++ b/helgrind/tests/rwlock_test.vgtest
@ -1 +1 @@
-prog: rwlock_test
+prog: ../../drd/tests/rwlock_test