fix make distclean failure

commit 85cd72c0a80d64ddbfd3156743037925bb7f8f5f
"Add the drd/tests/bug322621 regression test"

introduced make distclean failure.
Fix it by using symlink instead of a relative path in
drd/tests/Makefile.

Also, revert "ignore .dirstamp file appearing in helgrind/tests directory"
This reverts commit 718b47e184bc090b9f2a5f22904f59a272c9018d.

diff --git a/.gitignore b/.gitignore
index b671e7202dd9319f735c17df206a82e341f1d511..2eb268348517334b8f7806a76f1919ba568506ff 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -641,7 +641,6 @@
 /helgrind/tests/*.stdout.diff*
 /helgrind/tests/*.stdout.out
 /helgrind/tests/.deps
-/helgrind/tests/.dirstamp
 /helgrind/tests/annotate_hbefore
 /helgrind/tests/annotate_rwlock
 /helgrind/tests/bar_bad

diff --git a/drd/tests/Makefile.am b/drd/tests/Makefile.am
index 2a2c461296a08e8606955c013e2095ae0df92329..d09ca5f89a22dfe70ee942cd893ec47afb8c1a89 100644 (file)
--- a/drd/tests/Makefile.am
+++ b/drd/tests/Makefile.am
@@ -470,7 +470,7 @@ AM_CXXFLAGS += $(AM_FLAG_M3264_PRI) @FLAG_W_EXTRA@ @FLAG_FALIGNED_NEW@ \
 LDADD = -lpthread
 
 
-bug322621_SOURCES          = ../../helgrind/tests/bug322621.cpp
+bug322621_SOURCES           = bug322621.cpp
 concurrent_close_SOURCES    = concurrent_close.cpp
 dlopen_main_LDADD           = -ldl
 dlopen_lib_so_SOURCES       = dlopen_lib.c

diff --git a/drd/tests/bug322621.cpp b/drd/tests/bug322621.cpp
new file mode 120000 (symlink)
index 0000000..d082a5f
--- /dev/null
+++ b/drd/tests/bug322621.cpp
@@ -0,0 +1 @@
+../../helgrind/tests/bug322621.cpp
\ No newline at end of file

diff --git a/helgrind/tests/bug322621.cpp b/helgrind/tests/bug322621.cpp
index 8d31ca5a6226cc2350977e5ab53995aebf126e8a..08292dd33ac19de46b5b61bbcebfbc3bd951e195 100644 (file)
--- a/helgrind/tests/bug322621.cpp
+++ b/helgrind/tests/bug322621.cpp
@@ -2,7 +2,7 @@
 
 #include <pthread.h>
 #include <iostream>
-#include "../helgrind.h"
+#include "../../helgrind/helgrind.h"
 
 static int verbose;
 static pthread_t ls_thread;