Added test for not using leaf makefiles

This test was written some time ago, but I forget to commit it.

darcs-hash:20080417115111-f2ef6-fdaef8511db1ab33cab6ba4e0fa6ab5f9a753715.gz

diff --git a/tests/use_leaf_makefiles/Makefile b/tests/use_leaf_makefiles/Makefile
new file mode 100644 (file)
index 0000000..b22a357
--- /dev/null
+++ b/tests/use_leaf_makefiles/Makefile
@@ -0,0 +1,14 @@
+# 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
+

diff --git a/tests/use_leaf_makefiles/Makefile.omk b/tests/use_leaf_makefiles/Makefile.omk
new file mode 100644 (file)
index 0000000..f71b707
--- /dev/null
+++ b/tests/use_leaf_makefiles/Makefile.omk
@@ -0,0 +1 @@
+SUBDIRS=dir1 dir2

diff --git a/tests/use_leaf_makefiles/config.omk-default b/tests/use_leaf_makefiles/config.omk-default
new file mode 100644 (file)
index 0000000..6f53dd4
--- /dev/null
+++ b/tests/use_leaf_makefiles/config.omk-default
@@ -0,0 +1,5 @@
+# Start of OMK config file
+# This file should not be altered manually
+# Overrides should be stored in file config.omk
+
+# Config for 

diff --git a/tests/use_leaf_makefiles/dir1/Makefile b/tests/use_leaf_makefiles/dir1/Makefile
new file mode 100644 (file)
index 0000000..b22a357
--- /dev/null
+++ b/tests/use_leaf_makefiles/dir1/Makefile
@@ -0,0 +1,14 @@
+# 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
+

diff --git a/tests/use_leaf_makefiles/dir1/Makefile.omk b/tests/use_leaf_makefiles/dir1/Makefile.omk
new file mode 100644 (file)
index 0000000..55c340f
--- /dev/null
+++ b/tests/use_leaf_makefiles/dir1/Makefile.omk
@@ -0,0 +1,3 @@
+SUBDIRS=dir3
+
+USE_LEAF_MAKEFILES=n

diff --git a/tests/use_leaf_makefiles/dir1/dir3/Makefile.omk b/tests/use_leaf_makefiles/dir1/dir3/Makefile.omk
new file mode 100644 (file)
index 0000000..437f85f
--- /dev/null
+++ b/tests/use_leaf_makefiles/dir1/dir3/Makefile.omk
@@ -0,0 +1 @@
+$(warning Makefile.omk used without leaf Makefile)

diff --git a/tests/use_leaf_makefiles/dir2/Makefile b/tests/use_leaf_makefiles/dir2/Makefile
new file mode 100644 (file)
index 0000000..b22a357
--- /dev/null
+++ b/tests/use_leaf_makefiles/dir2/Makefile
@@ -0,0 +1,14 @@
+# 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
+

diff --git a/tests/use_leaf_makefiles/dir2/Makefile.omk b/tests/use_leaf_makefiles/dir2/Makefile.omk
new file mode 100644 (file)
index 0000000..cde062a
--- /dev/null
+++ b/tests/use_leaf_makefiles/dir2/Makefile.omk
@@ -0,0 +1 @@
+SUBDIRS=dir4

diff --git a/tests/use_leaf_makefiles/dir2/dir4/Makefile b/tests/use_leaf_makefiles/dir2/dir4/Makefile
new file mode 100644 (file)
index 0000000..d77ac5d
--- /dev/null
+++ b/tests/use_leaf_makefiles/dir2/dir4/Makefile
@@ -0,0 +1,4 @@
+$(warning Leaf Makefile included)
+
+%:
+       @echo Executed $@

diff --git a/tests/use_leaf_makefiles/runtest b/tests/use_leaf_makefiles/runtest
new file mode 100755 (executable)
index 0000000..fe975a8
--- /dev/null
+++ b/tests/use_leaf_makefiles/runtest
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. ../functions.sh
+
+exec 3>&1 >make.log
+make 2>&1 || canttest
+exec >&3
+grep "Makefile.omk used without leaf Makefile" make.log
+grep "Leaf Makefile included" make.log
+grep "Executed.*-pass" make.log