aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test/Makefile
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2013-01-25 11:06:57 +0100
committerAnders Svensson <[email protected]>2013-01-25 11:06:57 +0100
commit61f8a41388d95f6b8c0e2e5a06de586cecf184c6 (patch)
tree5c4a531e8ee983c57f472cf427d13ca13856c6ac /lib/diameter/test/Makefile
parent7b5aa58f4bd58d4682d3b29ca3dfa604ab51d962 (diff)
parent4f2f6392737407e2d04adc09b44ebdbdf03a904d (diff)
downloadotp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.tar.gz
otp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.tar.bz2
otp-61f8a41388d95f6b8c0e2e5a06de586cecf184c6.zip
Merge branch 'anders/diameter/R16A_release/OTP-10608'
* anders/diameter/R16A_release/OTP-10608: vsn -> 1.4 Update appup Spec fix Test makefile tweak Warn about applications/capabilities mismatches in doc Minor documentation fixes Remove upgrade code not needed at a major release Comment fix Add patch target to makefile
Diffstat (limited to 'lib/diameter/test/Makefile')
-rw-r--r--lib/diameter/test/Makefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/diameter/test/Makefile b/lib/diameter/test/Makefile
index 866d135bd9..aa4b7eaeb1 100644
--- a/lib/diameter/test/Makefile
+++ b/lib/diameter/test/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2010-2012. All Rights Reserved.
+# Copyright Ericsson AB 2010-2013. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in
@@ -62,17 +62,15 @@ ERL_COMPILE_FLAGS += +warn_export_vars \
# Targets
# ----------------------------------------------------
+all debug opt: $(TARGET_FILES)
+
# Require success ...
-all: opt
+run: $(SUITES)
# ... or not.
any: opt
$(MAKE) -i $(SUITES)
-run: $(SUITES)
-
-debug opt: $(TARGET_FILES)
-
clean:
rm -f $(TARGET_FILES)
rm -f depend.mk
@@ -101,7 +99,10 @@ help:
@echo " Compile all test suites."
@echo
@echo " run:"
- @echo " Compile and run all test suites."
+ @echo " Compile and run all test suites, stop on failure."
+ @echo
+ @echo " any:"
+ @echo " Compile and run all test suites, ignore any failures."
@echo
@echo " $(SUITES):"
@echo " Compile and run a specific test suite."