Renamed matinv_openmp test into omp_matinv. Added omp_matinv_racy and omp_prime_racy...

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

diff --git a/exp-drd/tests/Makefile.am b/exp-drd/tests/Makefile.am
index ad15307408588f33b23bd026769a2e6220979670..ccc2a2032210559305eff73bee2e5c45d37933a0 100644 (file)
--- a/exp-drd/tests/Makefile.am
+++ b/exp-drd/tests/Makefile.am
@@ -50,12 +50,15 @@ EXTRA_DIST =                                        \
        matinv.stdout.exp                           \
        matinv.stdout.exp-linuxthreads              \
        matinv.vgtest                               \
-       matinv_openmp.stderr.exp                    \
-       matinv_openmp.stdout.exp                    \
-       matinv_openmp.vgtest                        \
+       omp_matinv.stderr.exp                       \
+       omp_matinv.stdout.exp                       \
+       omp_matinv.vgtest                           \
        omp_matinv_racy.stderr.exp                  \
        omp_matinv_racy.stdout.exp                  \
        omp_matinv_racy.vgtest                      \
+       omp_prime_racy.stderr.exp                   \
+       omp_prime_racy.stdout.exp                   \
+       omp_prime_racy.vgtest                       \
        pth_barrier.stderr.exp                      \
        pth_barrier.stderr.exp-linuxthreads         \
        pth_barrier.vgtest                          \
@@ -232,7 +235,7 @@ check_PROGRAMS_COMMON = \
   tc24_nonzero_sem    \
   trylock
 
-check_PROGRAMS_OPENMP = omp_prime matinv_openmp
+check_PROGRAMS_OPENMP = omp_matinv omp_prime
 
 if HAVE_OPENMP
 check_PROGRAMS = $(check_PROGRAMS_COMMON) $(check_PROGRAMS_OPENMP)
@@ -370,10 +373,10 @@ trylock_SOURCES             = trylock.c
 trylock_LDADD               = -lpthread -lrt
 
 if HAVE_OPENMP
-matinv_openmp_SOURCES       = matinv_openmp.c
-matinv_openmp_CFLAGS        = -fopenmp
-matinv_openmp_LDFLAGS       = -fopenmp
-matinv_openmp_LDADD         = -lm
+omp_matinv_SOURCES          = omp_matinv.c
+omp_matinv_CFLAGS           = -fopenmp
+omp_matinv_LDFLAGS          = -fopenmp
+omp_matinv_LDADD            = -lm
 
 omp_prime_SOURCES           = omp_prime.c
 omp_prime_CFLAGS            = -fopenmp

diff --git a/exp-drd/tests/matinv_openmp.c b/exp-drd/tests/omp_matinv.c
similarity index 100%
rename from exp-drd/tests/matinv_openmp.c
rename to exp-drd/tests/omp_matinv.c

diff --git a/exp-drd/tests/matinv_openmp.stderr.exp b/exp-drd/tests/omp_matinv.stderr.exp
similarity index 100%
rename from exp-drd/tests/matinv_openmp.stderr.exp
rename to exp-drd/tests/omp_matinv.stderr.exp

diff --git a/exp-drd/tests/matinv_openmp.stdout.exp b/exp-drd/tests/omp_matinv.stdout.exp
similarity index 100%
rename from exp-drd/tests/matinv_openmp.stdout.exp
rename to exp-drd/tests/omp_matinv.stdout.exp

diff --git a/exp-drd/tests/matinv_openmp.vgtest b/exp-drd/tests/omp_matinv.vgtest
similarity index 55%
rename from exp-drd/tests/matinv_openmp.vgtest
rename to exp-drd/tests/omp_matinv.vgtest
index 378ddb421c0c1615f0cc0f3f3d556f07ddbee30c..eb952eb154e00e8c3243abf7798cc8d62e3c574f 100644 (file)
--- a/exp-drd/tests/matinv_openmp.vgtest
+++ b/exp-drd/tests/omp_matinv.vgtest
@@ -1,3 +1,3 @@
-prereq: test -e matinv_openmp
+prereq: test -e omp_matinv
 prog: matinv_openmp
 args: 30 -t 15 -q

diff --git a/exp-drd/tests/omp_matinv_racy.stderr.exp b/exp-drd/tests/omp_matinv_racy.stderr.exp
new file mode 100644 (file)
index 0000000..a3c5c4f
--- /dev/null
+++ b/exp-drd/tests/omp_matinv_racy.stderr.exp
@@ -0,0 +1 @@
+ERROR SUMMARY: 76 errors from 76 contexts

diff --git a/exp-drd/tests/omp_matinv_racy.stdout.exp b/exp-drd/tests/omp_matinv_racy.stdout.exp
new file mode 100644 (file)
index 0000000..3035da4
--- /dev/null
+++ b/exp-drd/tests/omp_matinv_racy.stdout.exp
@@ -0,0 +1 @@
+Error within bounds.

diff --git a/exp-drd/tests/omp_matinv_racy.vgtest b/exp-drd/tests/omp_matinv_racy.vgtest
new file mode 100644 (file)
index 0000000..ffc5bae
--- /dev/null
+++ b/exp-drd/tests/omp_matinv_racy.vgtest
@@ -0,0 +1,4 @@
+prereq: test -e omp_matinv
+prog: matinv_openmp
+args: 3 -t 2 -q -r
+stderr_filter: filter_error_summary