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

[Alkis Evlogimenos]

Changes in directory llvm-java/test:

Makefile.test updated: 1.32 -> 1.33
---
Log message:

Revert this patch: http://mail.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20050103/022943.html


---
Diffs of the changes:  (+7 -8)

Index: llvm-java/test/Makefile.test
diff -u llvm-java/test/Makefile.test:1.32 llvm-java/test/Makefile.test:1.33
--- llvm-java/test/Makefile.test:1.32	Mon Jan 10 23:54:07 2005
+++ llvm-java/test/Makefile.test	Tue Jan 11 00:31:59 2005
@@ -44,20 +44,19 @@
 .PRECIOUS: %.out-nat %.out-jit %.diff
 
 # rule to run a .class file with the jvm
-%.out-nat %.err-nat: %.class
+%.out-nat: %.class
 	-$(Verb)LD_LIBRARY_PATH=$(LibDir) $(JAVA) -cp Output $(notdir $*) \
-		> $*.out-nat 2> $*.err-nat
+		> $*.out-nat 2>&1
 
 # rule to run a .class file with the llvm jit
-%.out-jit %.err-jit: %.llvm.bc
-	-$(Verb)$(LLI) $< > $*.out-jit 2> $*.err-jit
+%.out-jit: %.llvm.bc
+	-$(Verb)$(LLI) $< > $*.out-jit 2>&1
 
 # rule to diff test output
-%.diff: %.out-nat %.err-nat %.out-jit %.err-jit
+%.diff: %.out-nat %.out-jit
 	$(Verb)diff $*.out-nat $*.out-jit > $@ \
-	&& echo -n "PASS: $(notdir $*)" || echo -n "FAIL: $(notdir $*)"
-	$(Verb)diff $*.err-nat $*.err-jit > /dev/null \
-	&& echo "" || echo " (stderr mismatch)"
+	&& echo "PASS: $(notdir $*)" \
+	|| echo "FAIL: $(notdir $*)"
 
 # rule to link bytecode with runtime
 %.llvm %.llvm.bc: %.linked.bc $(LibDir)/libjrt.bca $(EXTRA_OBJS) $(LOPT)