From 615df5f1f4058862342ec3171ceb78da09c40fc7 Mon Sep 17 00:00:00 2001
From: jestin
Date: Tue, 7 Jan 2003 10:39:44 +0000
Subject: Je vais simplifier la constructions de tests. TestApi est brutal et
 efficace pour tester l'api.

---
 tests/Makefile | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'tests/Makefile')

diff --git a/tests/Makefile b/tests/Makefile
index ac421c9..c34121b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,14 +1,14 @@
-JIKESPATH=/usr/lib/j2re1.3/lib/rt.jar:../lib/ivy-java.jar
+#RTPATH=/usr/lib/j2re1.3/lib/rt.jar
+RTPATH=/usr/lib/j2sdk1.4-bd/jre/lib/rt.jar
+JIKESPATH=:$(RTPATH):../lib/ivy-java.jar:/usr/share/java/repository
+CLASSPATH=-classpath ../lib/ivy-java.jar:. 
 JAVAC= jikes -classpath $(JIKESPATH)
 .SUFFIXES: .java .class
-SRC = TestNetSwing.java TestNet.java Bug.java BugTok.java BenchLocal.java
+SRC = TestNetSwing.java TestNet.java Bug.java BugTok.java BenchLocal.java ProbeBench.java DieSender.java TestApi.java
 OBJ = $(SRC:.java=.class)
-JAVAOPTS = -DIVY_PING
-JAVA = java $(JAVAOPTS)
-JDK118=/usr/local/jdk118_v3/bin/java
-JDK13=java 
-JDK12= /usr/local/jdk1.2.2/bin/java 
-JDK14= /usr/local/j2sdk1.4.0/bin/java
+#JAVAOPTS = -DIVY_PING
+JAVAOPTS =
+JAVA = java
 
 #LOCALNET=10.0.0.255:3456
 LOCALNET=10.192.36.255:3456
@@ -17,28 +17,26 @@ MULTICAST=228.1.2.3:4567
 .java.class:
 	$(JAVAC) $<
 
-all: $(OBJ)
-	@echo 'run make alltests'
-
-alltests: $(OBJ) unitaires test1 test2 jvm
+all: $(OBJ) api unitaires test1 test2 probe
 	
+probe:
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) fr.dgac.ivy.Probe < /dev/null
+api:
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) TestApi
+
 unitaires:
-	$(JAVA) $(JAVAOPTS) -classpath ../lib/ivy-java.jar:. fr.dgac.ivy.Ivy
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) fr.dgac.ivy.Ivy
 
 test1: $(OBJ)
-	$(JAVA) $(JAVAOPTS) -classpath ../lib/ivy-java.jar:. BenchLocal
-	$(JAVA) $(JAVAOPTS) -classpath ../lib/ivy-java.jar:. BenchLocal -b $(LOCALNET)
-	$(JAVA) $(JAVAOPTS) -classpath ../lib/ivy-java.jar:. BenchLocal -b $(MULTICAST)
-	$(JAVA) $(JAVAOPTS) -classpath ../lib/ivy-java.jar:. BenchLocal -d 100
-	$(JAVA) $(JAVAOPTS) -classpath ../lib/ivy-java.jar:. BenchLocal -d 0
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) BenchLocal
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) BenchLocal -b $(LOCALNET)
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) BenchLocal -b $(MULTICAST)
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) BenchLocal -d 100
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) BenchLocal -d 0
 
 test2: $(OBJ)
-	$(JAVA) $(JAVAOPTS) -classpath ../lib/ivy-java.jar:. BenchLocal -t 2 -d 100
-	$(JAVA) $(JAVAOPTS) -classpath ../lib/ivy-java.jar:. BenchLocal -t 2 -d 0
-
-jvm:
-	make JAVA=$(JDK14) test1
-	make JAVA=$(JDK14) test2
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) BenchLocal -t 2 -d 100
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) BenchLocal -t 2 -d 0
 
 clean:
 	/bin/rm -f $(OBJ) *.class
-- 
cgit v1.1