[llvm-commits] [poolalloc] r156139 - in /poolalloc/trunk: lib/DSA/DSTest.cpp test/Makefile

[Will Dietz]

Author: wdietz2
Date: Thu May  3 19:57:42 2012
New Revision: 156139

URL: http://llvm.org/viewvc/llvm-project?rev=156139&view=rev
Log:
Fix assert text for callee check, require assert build to run lit tests.

Modified:
    poolalloc/trunk/lib/DSA/DSTest.cpp
    poolalloc/trunk/test/Makefile

Modified: poolalloc/trunk/lib/DSA/DSTest.cpp
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/lib/DSA/DSTest.cpp?rev=156139&r1=156138&r2=156139&view=diff
==============================================================================
--- poolalloc/trunk/lib/DSA/DSTest.cpp (original)
+++ poolalloc/trunk/lib/DSA/DSTest.cpp Thu May  3 19:57:42 2012
@@ -684,7 +684,7 @@
     printCallees(expectedCallees, errs()); errs() << "\n";
     errs() << "                      *** Missing: \t";
     printCallees(missing, errs()); errs() << "\n";
-    assert(0 && "Analysis contained the specified callees!");
+    assert(0 && "Analysis didn't contain the specified callees!");
   }
 
   return true;

Modified: poolalloc/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/Makefile?rev=156139&r1=156138&r2=156139&view=diff
==============================================================================
--- poolalloc/trunk/test/Makefile (original)
+++ poolalloc/trunk/test/Makefile Thu May  3 19:57:42 2012
@@ -481,13 +481,17 @@
 
 #Run the lit tests for this project
 .PHONY: lit lit-report
-lit: lit.site.cfg $(TOOLS) $(LLVM_OBJ_ROOT)/test/site.exp
+lit: lit.site.cfg $(TOOLS) $(LLVM_OBJ_ROOT)/test/site.exp check-asserts
 	$(LLVM_SRC_ROOT)/utils/lit/lit.py $(PROJ_OBJ_ROOT)/test --path $(ToolDir) -s -v
 
 #Run the lit tests, but supress all error output--just report the test results.
-lit-report: lit.site.cfg $(TOOLS)
+lit-report: lit.site.cfg $(TOOLS) check-asserts
 	$(LLVM_SRC_ROOT)/utils/lit/lit.py $(PROJ_OBJ_ROOT)/test --path $(ToolDir) -q
 
+check-asserts:
+	$(if $(findstring Asserts,$(BuildMode)), , \
+		$(error Error: Lit tests require assertions to be enabled))
+
 clean::
 	-$(RM) -rf  `find $(PROJ_OBJ_DIR) -name Output -type d -print`
 	-$(RM) lit.site.cfg