From 840f16dda71213045f47b8169a9fff3dc2c54c7f Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 20 Feb 2009 19:00:18 +0000 Subject: [PATCH] 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 --- drd/tests/Makefile.am | 4 +++- {helgrind => drd}/tests/pth_barrier.c | 0 drd/tests/pth_barrier.vgtest | 4 ++-- drd/tests/pth_barrier2.vgtest | 4 ++-- drd/tests/pth_barrier3.vgtest | 4 ++-- {helgrind => drd}/tests/rwlock_race.c | 0 drd/tests/rwlock_race.vgtest | 2 +- {helgrind => drd}/tests/rwlock_test.c | 0 drd/tests/rwlock_test.vgtest | 2 +- helgrind/tests/Makefile.am | 4 +--- helgrind/tests/pth_barrier1.vgtest | 2 +- helgrind/tests/pth_barrier2.vgtest | 2 +- helgrind/tests/pth_barrier3.vgtest | 2 +- helgrind/tests/rwlock_race.vgtest | 2 +- helgrind/tests/rwlock_test.vgtest | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) rename {helgrind => drd}/tests/pth_barrier.c (100%) rename {helgrind => drd}/tests/rwlock_race.c (100%) rename {helgrind => drd}/tests/rwlock_test.c (100%) diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am index 630b4c92fd..e397327536 100644 --- 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 3f15c0e73b..adc781d142 100644 --- 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 bedb84161d..1fe94089a6 100644 --- 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 562866e49b..c17edb19a0 100644 --- 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 5a76b2c0f1..856138b2b7 100644 --- 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 2188dc6a57..6ce0263266 100644 --- 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 23d84428e2..6ffecd8b1c 100644 --- 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 f28eb6674b..7b0d62f1c1 100644 --- 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 d9bb01aa7d..13036b39c4 100644 --- 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 d17e7824f7..06ab6c353c 100644 --- 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 a7be205093..00b462f2c0 100644 --- 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 6ce0263266..4257fc9cfa 100644 --- a/helgrind/tests/rwlock_test.vgtest +++ b/helgrind/tests/rwlock_test.vgtest @@ -1 +1 @@ -prog: rwlock_test +prog: ../../drd/tests/rwlock_test -- 2.47.3