[llvm-commits] CVS: llvm-java/test/Makefile.test Makefile

[Alkis Evlogimenos]

Changes in directory llvm-java/test:

Makefile.test updated: 1.5 -> 1.6
Makefile updated: 1.2 -> 1.3

---
Log message:

Improve testing framework. Now the hierarchy is similar to
<llvm-root>/test.


---
Diffs of the changes:  (+10 -6)

Index: llvm-java/test/Makefile.test
diff -u llvm-java/test/Makefile.test:1.5 llvm-java/test/Makefile.test:1.6
--- llvm-java/test/Makefile.test:1.5	Fri Jul 23 19:46:24 2004
+++ llvm-java/test/Makefile.test	Fri Jul 23 20:29:34 2004
@@ -19,17 +19,21 @@
 .PHONY: clean
 
 clean::
-	$(RM) -f a.out core
+	$(RM) -f a.out core *.class .class-stamp
 	$(RM) -rf Output/
 
 # we don't want these files to be deleted by make, even if they are
 # intermediate results
 .PRECIOUS: Output/.dir Output/%.bc Output/%.ll Output/%.llvm.bc Output/%.llvm
 
-# rule to build raw bytecode from a classfile
-Output/%.raw.bc: %.class Output/.dir $(CLASS2LLVM)
-	$(CLASS2LLVM) $* | $(LOPT) -mem2reg > $@
-
 #rule to link in runtime to raw bytecode
 Output/%.linked.bc: Output/%.raw.bc $(BUILD_SRC_ROOT)/runtime/runtime.bc
 	$(LLVMTOOLCURRENT)/llvm-link$(EXEEXT) $^ -o $@
+
+# rule to make assembly from bytecode
+%.dis-ll: %.bc
+	$(LDIS) < $< > $@
+
+# rule to make bytecode from assembly
+%.bc: %.ll
+	$(LAS) < $< > $@


Index: llvm-java/test/Makefile
diff -u llvm-java/test/Makefile:1.2 llvm-java/test/Makefile:1.3
--- llvm-java/test/Makefile:1.2	Tue Jul 13 19:31:40 2004
+++ llvm-java/test/Makefile	Fri Jul 23 20:29:34 2004
@@ -8,6 +8,6 @@
 ##===----------------------------------------------------------------------===##
 LEVEL := ..
 
-BUILD_JAVA_SOURCE=1
+PARALLEL_DIRS := Programs Regression
 
 include $(LEVEL)/Makefile.common