Makefile/spec cleanup

2 files changed, 26 insertions, 44 deletions

diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index 0bd3c0493c..a69af8ef2f 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -16,11 +16,11 @@
 #
 # %CopyrightEnd%
 
-ifneq ($(ERL_TOP),)
+ifeq ($(ERL_TOP),)
+TOP = $(DIAMETER_TOP)
+else
 TOP = $(ERL_TOP)
 DIAMETER_TOP = $(TOP)/lib/diameter
-else
-TOP = $(DIAMETER_TOP)
 endif
 
 include $(TOP)/make/target.mk
@@ -98,7 +98,7 @@ ERL_COMPILE_FLAGS += $(DIAMETER_ERL_COMPILE_FLAGS)
 # Targets
 # ----------------------------------------------------
 
-test: $(SUITES)
+all test: $(SUITES)
 
 tests debug opt: $(BUILDTARGET)
 
@@ -116,6 +116,8 @@ $(EMAKEFILE):
 clean:
 	rm -f $(EMAKEFILE)
 	rm -f $(TARGET_FILES) 
+
+realclean: clean
 	rm -f errs core *~
 
 docs:
@@ -145,49 +147,39 @@ help:
 	@echo
 	@echo "  a) Run the official OTP test-server (which we do not describe here)"
 	@echo
-	@echo "  b) Run the test-server provided with this application."
-	@echo "     There are a number of targets to run the entire or parts"
-	@echo "     of this applications ($(APPLICATION)) test-suite"
+	@echo "  b) Run individual suites using targets in this makefile, target"
+	@echo "     xxx running the testcases contained in $(APPLICATION)_xxx_SUITE."
+	@echo "     Note that this requires GNU sed."
 	@echo
 	@echo "Targets:"
 	@echo
-	@echo "    help"
-	@echo "      Print this info"
+	@echo "    all"
+	@echo "        Run all test suites."
 	@echo
-	@echo "    info"
-	@echo "      Prints various environment variables."
-	@echo "      May be useful when debugging the Makefile."
+	@echo "    $(SUITES)"
+	@echo "        Run a specific test suite."
 	@echo
-	@echo "    tests | debug | opt "
-	@echo "      Compile all test-code."
+	@echo "    targets"
+	@echo "        Compile all test-code."
 	@echo
-	@echo "    clean "
-	@echo "      Remove all targets."
+	@echo "    clean"
+	@echo "        Remove generated files."
 	@echo
-	@echo "    test"
-	@echo "      Run all test suites."
+	@echo "    info"
+	@echo "        Prints various environment variables."
+	@echo "        May be useful when debugging this Makefile."
 	@echo
-	@echo "    $(SUITES)"
-	@echo "      Run a specific test suite."
+	@echo "    help"
+	@echo "        Print this info."
 	@echo
 
-
 # ----------------------------------------------------
 # Special Targets
 # ----------------------------------------------------
 
-all: $(SUITES)
-
-beam: targets
-
-log:
-	mkdir $@
-
-##########################
-
 # This assumes GNU sed to exit 1 if the output looks to indicate failure.
 # diameter_ct:run/1 itself can't tell (it seems).
-$(SUITES): log beam
+$(SUITES): log targets
 	$(ERL) -noshell \
 	        -pa ../ebin \
 	        -sname diameter_test_$@ \
@@ -195,6 +187,9 @@ $(SUITES): log beam
 	        -s init stop \
 	| sed '/ FAILED /h; p; $$!d; x; /./!d; Q 1'
 
+log:
+	mkdir $@
+
 # ----------------------------------------------------
 # Release Targets
 # ---------------------------------------------------- 
@@ -208,8 +203,3 @@ release_docs_spec:
 release_tests_spec: tests
 	$(INSTALL_DIR)  $(RELSYSDIR)
 	$(INSTALL_DATA) $(RELTEST_FILES) $(RELSYSDIR)
-#	$(INSTALL_DATA) $(TEST_SPEC_FILE) $(COVER_SPEC_FILE) \
-#                        $(HRL_FILES) $(ERL_FILES) \
-#                        $(RELSYSDIR)
-#
-	chmod -f -R u+w $(RELSYSDIR)
diff --git a/lib/diameter/test/diameter.spec b/lib/diameter/test/diameter.spec
index a6e71762eb..fae7863bec 100644
--- a/lib/diameter/test/diameter.spec
+++ b/lib/diameter/test/diameter.spec
@@ -1,9 +1 @@
 {suites, "../diameter_test", all}.
-%%{skip, {diameter_compiler_test, all, "Not yet implemented"}}.
-%%{skip, {diameter_config_test, all,   "Not yet implemented"}}.
-%%{skip, {diameter_peer_test, all,     "Not yet implemented"}}.
-%%{skip, {diameter_reg_test, all,      "Not yet implemented"}}.
-%%{skip, {diameter_session_test, all,  "Not yet implemented"}}.
-%%{skip, {diameter_stats_test, all,    "Not yet implemented"}}.
-%%{skip, {diameter_sync_test, all,     "Not yet implemented"}}.
-%%{skip, {diameter_tcp_test, all,      "Not yet implemented"}}.