Fix incorrect suffix

[oota-llvm.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 5a9a7f0366bc7456ff73a6ba1f3e885e61c133e6..c3244d66093b1280311864ef6806296c383048c0 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 LEVEL  = ..
-DIRS   = Programs
+DIRS   = 
 
 #
 # Make QMTest the default for testing features and regressions
@@ -34,6 +34,10 @@ ifeq ($(OS),SunOS)
 QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.sunos.qmr
 endif
 
+ifeq ($(OS),Darwin)
+QMEXPECT:=$(LLVM_SRC_ROOT)/test/QMTest/expectations.darwin.qmr
+endif
+
 #
 # This is configuration information used by the test suite.  In QM Test, it's
 # called a 'context.'
@@ -47,7 +51,8 @@ CONTEXT= -c "srcroot=$(LLVM_SRC_ROOT)" \
          -c "cxx=$(CXX)" \
          -c "llvmgcc=$(LLVMGCC)" \
          -c "llvmgxx=$(LLVMGXX)" \
-         -c "make=$(MAKE)"
+         -c "make=$(MAKE)" \
+         -c "python=$(PYTHON)"
 
 #
 # Location of the QMTest program.
@@ -91,14 +96,17 @@ register:
        $(QMTEST) register test llvm.CXXTest
        $(QMTEST) register database llvmdb.llvmdb
 
-#
 # Start up the QMTest GUI
-#
 gui::
        $(QMTEST) gui --no-browser --daemon
 
-clean::
+# Also get rid of qmtest garbage when we 'make clean' in this directory.
+clean:: qmtest-clean
+
+qmtest-clean:
        $(RM) -rf $(LLVM_OBJ_ROOT)/test/tmp
        $(RM) -f $(LLVM_SRC_ROOT)/test/QMTest/*.pyo \
                $(LLVM_OBJ_ROOT)/test/QMTest/*.pyo
+       $(RM) -f $(LLVM_SRC_ROOT)/test/results.qmr \
+               $(LLVM_OBJ_ROOT)/test/results.qmr