[llvm-commits] [test-suite] r152992 - in /test-suite/trunk: Makefile Makefile.programs Makefile.rules

[Daniel Dunbar]

Author: ddunbar
Date: Sat Mar 17 12:13:47 2012
New Revision: 152992

URL: http://llvm.org/viewvc/llvm-project?rev=152992&view=rev
Log:
[test-suite] Change to always use test-suite built fpcmp and timeit tools.

Modified:
    test-suite/trunk/Makefile
    test-suite/trunk/Makefile.programs
    test-suite/trunk/Makefile.rules

Modified: test-suite/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile?rev=152992&r1=152991&r2=152992&view=diff
==============================================================================
--- test-suite/trunk/Makefile (original)
+++ test-suite/trunk/Makefile Sat Mar 17 12:13:47 2012
@@ -20,7 +20,3 @@
 build-for-llvm-top:
 	./configure --with-llvmsrc=$(LLVM_TOP)/llvm --with-llvmobj=$(LLVM_TOP)/llvm --srcdir=$(LLVM_TOP)/test-suite --with-llvmgccdir=$(LLVM_TOP)/install --with-externals=$(LLVM_TOP)/externals
 	$(MAKE)
-
-tools:
-	$(MAKE) -C tools all
-.PHONY: tools

Modified: test-suite/trunk/Makefile.programs
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.programs?rev=152992&r1=152991&r2=152992&view=diff
==============================================================================
--- test-suite/trunk/Makefile.programs (original)
+++ test-suite/trunk/Makefile.programs Sat Mar 17 12:13:47 2012
@@ -128,10 +128,8 @@
 RUNSAFELY := $(RUNSAFELY) -u $(RUNUNDER)
 endif
 
-ifdef TIMEIT
 RUNSAFELY := $(RUNSAFELY) -t "$(TIMEIT_TARGET)"
 RUNSAFELYLOCAL := $(RUNSAFELYLOCAL) -t "$(TIMEIT)"
-endif
 
 ifdef NO_WATCHDOG
 RUNSAFELY := $(RUNSAFELY) -nw

Modified: test-suite/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.rules?rev=152992&r1=152991&r2=152992&view=diff
==============================================================================
--- test-suite/trunk/Makefile.rules (original)
+++ test-suite/trunk/Makefile.rules Sat Mar 17 12:13:47 2012
@@ -101,6 +101,16 @@
 # Default rule for installing only bytecode.
 install-bytecode::
 
+# If we are running at the first level, build the tools.
+ifeq ($(MAKELEVEL),0)
+test:: tools
+all:: tools
+endif
+
+tools:
+	$(MAKE) -C $(PROJ_OBJ_ROOT)/tools all
+.PHONY: tools
+
 # Print out the directories used for building
 prdirs::
 	@${ECHO} "Build Source Root: " $(PROJ_SRC_ROOT)
@@ -321,18 +331,10 @@
 LBUGPOINT = $(LLVMTOOLCURRENT)/bugpoint$(EXEEXT)
 LFINDMISOPT= $(LLVM_SRC_ROOT)/utils/findmisopt
 
-ifeq ($(HAS_LLVM),1)
-FPCMP     = $(LLVMTOOLCURRENT)/fpcmp
-else
+# Use our own timing and comparison tools.
 FPCMP     = $(PROJ_OBJ_ROOT)/tools/fpcmp
-endif
-
-ifeq ($(HAS_LLVM),0)
-# Not strictly related to HAS_LLVM, but otherwise in generally tools weren't
-# being built.
 TIMEIT        = $(PROJ_OBJ_ROOT)/tools/timeit
 TIMEIT_TARGET = $(PROJ_OBJ_ROOT)/tools/timeit-target
-endif
 
 LCC := $(LLVMCC)
 LCXX := $(LLVMCXX)