From d5d548edaf6cf1ffb2d214b2bf0329ec341c42a1 Mon Sep 17 00:00:00 2001
From: jestin
Date: Tue, 27 Jul 2004 16:23:00 +0000
Subject: major test rewrite to abide to the latest API. Updated tests for
 async msg handling and protect newline

---
 tests/Makefile | 62 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 11 deletions(-)

(limited to 'tests/Makefile')

diff --git a/tests/Makefile b/tests/Makefile
index 7ebc5a8..e2b0aa0 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,10 +1,18 @@
 .SUFFIXES: .java .class
-SRC = TestNet.java Bug.java BugTok.java BenchLocal.java ProbeBench.java DieSender.java TestApi.java
+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
 
-GNUPATH=/usr/share/java/repository:/usr/share/java/gnu.getopt.0.9.jar:/usr/share/java/gnu-regexp-1.1.3.jar
+#GNUPATH=$(HOME)/JavaFactory
+#GNUPATH=/usr/share/java/gnu.getopt.0.9.jar:/usr/share/java/gnu-regexp-1.1.3.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
-ADD=$(GNUPATH):$(BUILDPATH)
+#ADD=$(BUILDPATH):$(GNUPATH)
+ADD=$(BUILDPATH)
 
 #JAVAOPTS = -DIVY_PING
 # DONOTBUILD = TestNetSwing.java  # Color(r,g,b,a) doesn't exist in jdk1.1
@@ -12,18 +20,40 @@ ADD=$(GNUPATH):$(BUILDPATH)
 ######################################
 # generic setup
 ######################################
+#RTPATH = /usr/lib/j2se/1.4/jre/lib/rt.jar
+#CLASSPATH=-classpath .:$(ADD):$(RTPATH)
 CLASSPATH=-classpath .:$(ADD)
-JAVACOPTS= -deprecation
-JAVAOPTS =
+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
+
+######################################
+# 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 =
+#JAVAOPTS = $(BUS)
 #JAVA = /usr/local/jdk118_v3/bin/java 
 #JAVAC = /usr/local/jdk118_v3/bin/javac
 
@@ -32,7 +62,7 @@ JAVA = java
 ######################################
 #CLASSPATH = -classpath .:$(ADD)
 #JAVACOPTS = -deprecation
-#JAVAOPTS =
+#JAVAOPTS = $(BUS)
 #JAVA = /usr/local/jdk1.2.2/bin/java 
 #JAVAC = /usr/local/jdk1.2.2/bin/javac
 
@@ -41,24 +71,34 @@ JAVA = java
 ######################################
 #CLASSPATH = -classpath .:$(ADD)
 #JAVACOPTS = -deprecation
-#JAVAOPTS =
+#JAVAOPTS = $(BUS)
 #JAVA = /usr/local/j2sdk1.3.1/bin/java 
 #JAVAC = /usr/local/j2sdk1.3.1/bin/javac
 #LOCALNET=10.0.0.255:3456
-
-LOCALNET=10.192.36.255:3456
+LOCALNET=$(MULTICAST)
+#LOCALNET=10.192.36.255:3456
 MULTICAST=228.1.2.3:4567
 
 .java.class:
 	$(JAVAC) $(JAVACOPTS) $(CLASSPATH) $<
 
-all: $(OBJ) api unitaires test1 test2 probe
+all: $(OBJ)
+	@echo "all modules built. run make run"
+
+run: $(OBJ) nl api unitaires test1 test2 probe async
 	
+nl:
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) NewLine -n 100000
+
 probe:
 	$(JAVA) $(JAVAOPTS) $(CLASSPATH) fr.dgac.ivy.Probe < /dev/null
+
 api:
 	$(JAVA) $(JAVAOPTS) $(CLASSPATH) TestApi
 
+async: AsyncAPI.class
+	$(JAVA) $(JAVAOPTS) $(CLASSPATH) AsyncAPI -r -l 20 -d 5 -s 10000
+
 unitaires:
 	$(JAVA) $(JAVAOPTS) $(CLASSPATH) fr.dgac.ivy.Ivy
 
-- 
cgit v1.1