Fix parallel_make test to not return false positives

diff --git a/tests/parallel_make/dir1/Makefile b/tests/parallel_make/dir1/Makefile
index b22a35765d37ba44709f41e4182c62dbed0e43b7..36efdffc1e67f2984559dd9ef6b7ec8351d12561 100644 (file)
--- a/tests/parallel_make/dir1/Makefile
+++ b/tests/parallel_make/dir1/Makefile
@@ -1,14 +1,2 @@
-# Generic directory or leaf node makefile for OCERA make framework
-
-ifndef MAKERULES_DIR
-MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
-endif
-
-ifeq ($(MAKERULES_DIR),)
-all : default
-.DEFAULT::
-       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
-else
-include $(MAKERULES_DIR)/Makefile.rules
-endif
-
+%:
+       echo $(@) in dir1

diff --git a/tests/parallel_make/dir2/Makefile b/tests/parallel_make/dir2/Makefile
index b22a35765d37ba44709f41e4182c62dbed0e43b7..a4ce843596be531ecb9a65d38de8010bf8256e90 100644 (file)
--- a/tests/parallel_make/dir2/Makefile
+++ b/tests/parallel_make/dir2/Makefile
@@ -1,14 +1,2 @@
-# Generic directory or leaf node makefile for OCERA make framework
-
-ifndef MAKERULES_DIR
-MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
-endif
-
-ifeq ($(MAKERULES_DIR),)
-all : default
-.DEFAULT::
-       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
-else
-include $(MAKERULES_DIR)/Makefile.rules
-endif
-
+%:
+       echo $(@) in dir2

diff --git a/tests/parallel_make/dir3/Makefile b/tests/parallel_make/dir3/Makefile
index b22a35765d37ba44709f41e4182c62dbed0e43b7..da555a9fc93de80bd5ea28ae020a8d0345027af4 100644 (file)
--- a/tests/parallel_make/dir3/Makefile
+++ b/tests/parallel_make/dir3/Makefile
@@ -1,14 +1,2 @@
-# Generic directory or leaf node makefile for OCERA make framework
-
-ifndef MAKERULES_DIR
-MAKERULES_DIR := $(shell ( old_pwd="" ;  while [ ! -e Makefile.rules ] ; do if [ "$$old_pwd" = `pwd`  ] ; then exit 1 ; else old_pwd=`pwd` ; cd -L .. 2>/dev/null ; fi ; done ; pwd ) )
-endif
-
-ifeq ($(MAKERULES_DIR),)
-all : default
-.DEFAULT::
-       @echo -e "\nThe Makefile.rules has not been found in this or partent directory\n"
-else
-include $(MAKERULES_DIR)/Makefile.rules
-endif
-
+%:
+       echo $(@) in dir3