1 files changed, 20 insertions, 90 deletions
diff --git a/tests/Makefile b/tests/Makefile
index 9c002f0..4e13679 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,101 +1,27 @@
-.SUFFIXES: .java .class
-SRC =	TestNet.java Bug.java BugTok.java BenchLocal.java ProbeBench.java \
-	DieSender.java TestApi.java NewLine.java AsyncAPI.java
-OBJ = $(SRC:.java=.class)
-#BUS=
-#BUS=-DIVYBUS=224.5.6.7:8910
+# Makefile for Ivy test class suite
 
-#GNUPATH=$(HOME)/JavaFactory
-GNUPATH=/usr/share/java/gnu.getopt.jar:/usr/share/java/regexp.jar
-#GNUPATH=/usr/share/java/regexp.jar:/usr/share/java/gnu-getopt.jar
-#GNUPATH=/usr/share/java/repository:/usr/share/java/gnu.getopt.0.9.jar:/usr/share/java/gnu-regexp-1.1.3.jar
-#GNUPATH=
-BUILDPATH=../lib/ivy-java.jar
-#BUILDPATH=../src:../bundle
-ADD=$(BUILDPATH):$(GNUPATH)
-#ADD=$(BUILDPATH)
+include ../java.mk
+IVYPATH=../lib/ivy-java.jar
+CLASSPATH=-classpath classes:$(IVYPATH)
 
-#JAVAOPTS = -DIVY_PING
-# DONOTBUILD = TestNetSwing.java  # Color(r,g,b,a) doesn't exist in jdk1.1
+SRC = *.java	
+# Warning TestNetSwing.java  cant build with jdk1.1
+# as Color(r,g,b,a) doesn't exist in jdk1.1
 
-######################################
-# generic setup
-######################################
-#RTPATH = /usr/lib/j2se/1.4/jre/lib/rt.jar
-#CLASSPATH=-classpath .:$(ADD):$(RTPATH)
-#CLASSPATH=-classpath .:$(ADD)
-#JAVACOPTS= -deprecation 
-#JAVAOPTS = $(BUS)
-#JAVAOPTS = $(BUS) -DIVY_DEBUG
-#JAVAC= jikes
-#JAVAC= javac
-#JAVA = java
-
-######################################
-# generic setup
-######################################
-CLASSPATH=-classpath .:$(ADD)
-JAVACOPTS= -deprecation
-JAVAOPTS = $(BUS)
-JAVAC= javac
-JAVA = java
-
-######################################
-# Kaffe  (debian woody)
-######################################
-#CLASSPATH=-classpath .:$(ADD):/usr/share/kaffe/Klasses.jar
-#JAVACOPTS= -deprecation
-#JAVAOPTS = $(BUS)
-#JAVAC= javac
-#JAVA = kaffe
-
-######################################
-# SUN 1.4.0
-######################################
-#CLASSPATH=-classpath .:$(ADD)
-#JAVACOPTS= -deprecation
-#JAVAOPTS = $(BUS)
-#JAVAC= /opt/Java/j2sdk1.4.0_01/bin/javac
-#JAVA = /opt/Java/j2sdk1.4.0_01/bin/java
-
-######################################
-# local Blackdown linux 118_v3 system
-######################################
-#CLASSPATH = -classpath .:/usr/local/jdk118_v3/lib/classes.zip:/home/jestin/java/Jars/swingall.jar:$(ADD)
-#JAVACOPTS =
-#JAVAOPTS = $(BUS)
-#JAVA = /usr/local/jdk118_v3/bin/java 
-#JAVAC = /usr/local/jdk118_v3/bin/javac
-
-######################################
-# local Blackdown linux 1.2.2
-######################################
-#CLASSPATH = -classpath .:$(ADD)
-#JAVACOPTS = -deprecation
-#JAVAOPTS = $(BUS)
-#JAVA = /usr/local/jdk1.2.2/bin/java 
-#JAVAC = /usr/local/jdk1.2.2/bin/javac
-
-######################################
-# local Blackdown linux 1.3.1
-######################################
-#CLASSPATH = -classpath .:$(ADD)
-#JAVACOPTS = -deprecation
-#JAVAOPTS = $(BUS)
-#JAVA = /usr/local/j2sdk1.3.1/bin/java 
-#JAVAC = /usr/local/j2sdk1.3.1/bin/javac
+#LOCALNET=10.192.36.255:3456
 #LOCALNET=10.0.0.255:3456
 LOCALNET=$(MULTICAST)
-#LOCALNET=10.192.36.255:3456
 MULTICAST=228.1.2.3:4567
 
-.java.class:
-	$(JAVAC) $(JAVACOPTS) $(CLASSPATH) $<
 
-all: $(OBJ)
+all:
+	$(JAVAC) -d classes $(JAVACOPTS) $(CLASSPATH) $(SRC)
 	@echo "all modules built. run make run"
 
-run: $(OBJ) nl api unitaires test1 test2 probe async
+run: nl api unitaires test1 test2 probe async stop request
+	
+request:
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) Request
 	
 nl:
 	$(JAVA) $(JAVAOPTS) $(CLASSPATH) NewLine -n 100000
@@ -106,9 +32,12 @@ probe:
 api:
 	$(JAVA) $(JAVAOPTS) $(CLASSPATH) TestApi
 
-async: AsyncAPI.class
+async: 
 	$(JAVA) $(JAVAOPTS) $(CLASSPATH) AsyncAPI -r -l 5 -d 1 -s 10
 
+stop: 
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) StopStart
+
 unitaires:
 	$(JAVA) $(JAVAOPTS) $(CLASSPATH) fr.dgac.ivy.Ivy
 
@@ -124,4 +53,5 @@ test2: $(OBJ)
 	$(JAVA) $(JAVAOPTS) $(CLASSPATH) BenchLocal -t 2 -d 0
 
 clean:
-	/bin/rm -f $(OBJ) *.class
+	/bin/rm -fR $(OBJ) *.class classes
+	@mkdir classes