[llvm-commits] [test-suite] r108981 - /test-suite/trunk/Makefile.rules

[Daniel Dunbar]

Author: ddunbar
Date: Tue Jul 20 21:07:59 2010
New Revision: 108981

URL: http://llvm.org/viewvc/llvm-project?rev=108981&view=rev
Log:
Invent an LLVM_RELEASE_IS_PLUS_ASSERTS make variable, to allow using LLVM test
suite with older LLVM source trees.

Modified:
    test-suite/trunk/Makefile.rules

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=108981&r1=108980&r2=108981&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Tue Jul 20 21:07:59 2010
@@ -152,12 +152,25 @@
   CONFIGURATION := $(CONFIGURATION)+Profile
 endif
 
+# We cleverly reversed the sense of this variable in r107758, support use of
+# LLVM_RELEASE_IS_PLUS_ASSERTS to allow testing old LLVM revs. We can eliminate
+# this when we kill the dependency on LLVM's Makefiles.
+ifeq ($(LLVM_RELEASE_IS_PLUS_ASSERTS),1)
+
+ifeq ($(DISABLE_ASSERTIONS),1)
+  CONFIGURATION := $(CONFIGURATION)-Asserts
+endif
+
+else
+
 # Unless DISABLE_ASSERTIONS=1 is specified (make command line or configured),
 # adjust the CONFIGURATION name appropriately (to match LLVM makefiles)
 ifneq ($(DISABLE_ASSERTIONS),1)
   CONFIGURATION := $(CONFIGURATION)+Asserts
 endif
 
+endif
+
 # If ENABLE_EXPENSIVE_CHECKS=1 is specified (make command line or
 # configured), then adjust the CONFIGURATION name appropriately
 # (to match LLVM makefiles)