Thread: [C-MPI-commits] SF.net SVN: c-mpi:[88] test/driver
Status: Pre-Alpha
Brought to you by:
jmwozniak
Menu
▾
▴
c-mpi-commits
|
From: <jmw...@us...> - 2010-05-11 21:23:37
|
Revision: 88
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=88&view=rev
Author: jmwozniak
Date: 2010-05-11 21:23:31 +0000 (Tue, 11 May 2010)
Log Message:
-----------
Better test names
Added Paths:
-----------
test/driver/test-cmd-put.c
test/driver/test-cmd-quit.c
test/driver/test-cmd-sleep.c
Removed Paths:
-------------
test/driver/test01.c
test/driver/test02.c
test/driver/test03.c
Copied: test/driver/test-cmd-put.c (from rev 87, test/driver/test03.c)
===================================================================
--- test/driver/test-cmd-put.c (rev 0)
+++ test/driver/test-cmd-put.c 2010-05-11 21:23:31 UTC (rev 88)
@@ -0,0 +1,26 @@
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <accessor.h>
+
+int
+main(int argc, char* argv[])
+{
+ driver_access_fifo();
+
+ char* data = "hello does this work";
+
+ fprintf(to_cmpi, "put key1 %i\n", (int) strlen(data));
+ fprintf(to_cmpi, "%s", data);
+ fflush(to_cmpi);
+
+ char output[32];
+ fscanf(from_cmpi, "%s", output);
+
+ assert(!strcmp(output, "ok"));
+
+ return 0;
+}
Copied: test/driver/test-cmd-quit.c (from rev 87, test/driver/test02.c)
===================================================================
--- test/driver/test-cmd-quit.c (rev 0)
+++ test/driver/test-cmd-quit.c 2010-05-11 21:23:31 UTC (rev 88)
@@ -0,0 +1,24 @@
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <mpi_tools.h>
+#include <accessor.h>
+
+int
+main(int argc, char* argv[])
+{
+ int error;
+
+ error = driver_access_fifo();
+ assert(error);
+
+ fprintf(to_cmpi, "quit\n");
+ fflush(to_cmpi);
+ char output[32];
+ fscanf(from_cmpi, "%s", output);
+
+ assert(!strcmp(output, "ok"));
+
+ return 0;
+}
Copied: test/driver/test-cmd-sleep.c (from rev 85, test/driver/test01.c)
===================================================================
--- test/driver/test-cmd-sleep.c (rev 0)
+++ test/driver/test-cmd-sleep.c 2010-05-11 21:23:31 UTC (rev 88)
@@ -0,0 +1,24 @@
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <accessor.h>
+
+int
+main(int argc, char* argv[])
+{
+ int error;
+
+ driver_access_fifo();
+
+ fprintf(to_cmpi, "sleep 3\n");
+ fflush(to_cmpi);
+ char output[32];
+ error = fscanf(from_cmpi, "%s", output);
+
+ assert(!strcmp(output, "ok"));
+
+ return 0;
+}
Deleted: test/driver/test01.c
===================================================================
--- test/driver/test01.c 2010-05-11 21:22:09 UTC (rev 87)
+++ test/driver/test01.c 2010-05-11 21:23:31 UTC (rev 88)
@@ -1,24 +0,0 @@
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <accessor.h>
-
-int
-main(int argc, char* argv[])
-{
- int error;
-
- driver_access_fifo();
-
- fprintf(to_cmpi, "sleep 3\n");
- fflush(to_cmpi);
- char output[32];
- error = fscanf(from_cmpi, "%s", output);
-
- assert(!strcmp(output, "ok"));
-
- return 0;
-}
Deleted: test/driver/test02.c
===================================================================
--- test/driver/test02.c 2010-05-11 21:22:09 UTC (rev 87)
+++ test/driver/test02.c 2010-05-11 21:23:31 UTC (rev 88)
@@ -1,24 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <mpi_tools.h>
-#include <accessor.h>
-
-int
-main(int argc, char* argv[])
-{
- int error;
-
- error = driver_access_fifo();
- assert(error);
-
- fprintf(to_cmpi, "quit\n");
- fflush(to_cmpi);
- char output[32];
- fscanf(from_cmpi, "%s", output);
-
- assert(!strcmp(output, "ok"));
-
- return 0;
-}
Deleted: test/driver/test03.c
===================================================================
--- test/driver/test03.c 2010-05-11 21:22:09 UTC (rev 87)
+++ test/driver/test03.c 2010-05-11 21:23:31 UTC (rev 88)
@@ -1,26 +0,0 @@
-
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <accessor.h>
-
-int
-main(int argc, char* argv[])
-{
- driver_access_fifo();
-
- char* data = "hello does this work";
-
- fprintf(to_cmpi, "put key1 %i\n", (int) strlen(data));
- fprintf(to_cmpi, "%s", data);
- fflush(to_cmpi);
-
- char output[32];
- fscanf(from_cmpi, "%s", output);
-
- assert(!strcmp(output, "ok"));
-
- return 0;
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmw...@us...> - 2010-05-11 21:25:23
|
Revision: 90
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=90&view=rev
Author: jmwozniak
Date: 2010-05-11 21:25:17 +0000 (Tue, 11 May 2010)
Log Message:
-----------
Rename to test-sleep
Added Paths:
-----------
test/driver/test-sleep.zsh
Removed Paths:
-------------
test/driver/test02.zsh
Copied: test/driver/test-sleep.zsh (from rev 89, test/driver/test02.zsh)
===================================================================
--- test/driver/test-sleep.zsh (rev 0)
+++ test/driver/test-sleep.zsh 2010-05-11 21:25:17 UTC (rev 90)
@@ -0,0 +1,20 @@
+#!/bin/zsh
+
+make -j 3 D=1 test/driver/test02.x test/driver/test03.x \
+ test/driver/test_driver.x
+[[ $? != 0 ]] && exit
+sleep 1
+
+mpiexec -n 5 test/driver/test_driver.x -n 4 &
+DRIVER_PID=${!}
+
+sleep 5
+
+print "Launching tool 03..."
+test/driver/test03.x
+
+print "Launching tool 02..."
+test/driver/test02.x
+
+wait
+
Deleted: test/driver/test02.zsh
===================================================================
--- test/driver/test02.zsh 2010-05-11 21:24:42 UTC (rev 89)
+++ test/driver/test02.zsh 2010-05-11 21:25:17 UTC (rev 90)
@@ -1,20 +0,0 @@
-#!/bin/zsh
-
-make -j 3 D=1 test/driver/test02.x test/driver/test03.x \
- test/driver/test_driver.x
-[[ $? != 0 ]] && exit
-sleep 1
-
-mpiexec -n 5 test/driver/test_driver.x -n 4 &
-DRIVER_PID=${!}
-
-sleep 5
-
-print "Launching tool 03..."
-test/driver/test03.x
-
-print "Launching tool 02..."
-test/driver/test02.x
-
-wait
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmw...@us...> - 2010-05-12 14:44:50
|
Revision: 100
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=100&view=rev
Author: jmwozniak
Date: 2010-05-12 14:44:42 +0000 (Wed, 12 May 2010)
Log Message:
-----------
Cleanup fixes
Modified Paths:
--------------
Makefile.in
src/cmpi-cp/module.mk.in
src/cmpi-db/module.mk.in
test/cmpi-db/module.mk.in
test/driver/module.mk.in
Modified: Makefile.in
===================================================================
--- Makefile.in 2010-05-12 02:59:18 UTC (rev 99)
+++ Makefile.in 2010-05-12 14:44:42 UTC (rev 100)
@@ -309,6 +309,7 @@
DIR :=
# include $(MODULES)
+PROGS :=
TABLE_OBJS :=
include src/mpi_tools/module.mk
include src/gossip/module.mk
@@ -482,10 +483,10 @@
$(Q) " CLEAN"
$(E)rm -fv $(CMPI_DEPS) $(TEST_DEPS) \
$(MPIRPC) $(CMPI) $(ADTS_OBJS) $(MPIRPC_OBJS) $(CMPI_OBJS) \
- $(KDA_OBJS) $(CMPI_IO) $(CMPI_PICS) \
+ $(KDA_OBJS) $(CMPI_IO) $(CMPI_OBJS) $(TABLE_OBJS) \
hex unhex hexord unpublish node driver \
$(TEST_OUTPUT) $(TEST_PROGS) $(TEST_OBJS) \
- $(CMPI_PROGS) $(CMPI_CP_OBJS) splint.out
+ $(PROGS) $(CMPICP_OBJS) $(CMPIDB_OBJS) splint.out
$(E)find . -name "*.failed" -exec rm -fv \{\} \;
$(E)find . -name "*.bombed" -exec rm -fv \{\} \;
$(E)find . -name "test-success.out" -exec rm -fv \{\} \;
Modified: src/cmpi-cp/module.mk.in
===================================================================
--- src/cmpi-cp/module.mk.in 2010-05-12 02:59:18 UTC (rev 99)
+++ src/cmpi-cp/module.mk.in 2010-05-12 14:44:42 UTC (rev 100)
@@ -3,7 +3,7 @@
DIR := src/cmpi-cp
-CMPICP_PROGS += bin/cmpi-cp
+PROGS += bin/cmpi-cp
CMPICP_SRC += src/cmpi-cp/cmpi-cp.c
CMPICP_OBJS = src/cmpi-cp/cmpi-cp.o src/cmpi/accessor.o src/mpi_tools/io_tools.o
Modified: src/cmpi-db/module.mk.in
===================================================================
--- src/cmpi-db/module.mk.in 2010-05-12 02:59:18 UTC (rev 99)
+++ src/cmpi-db/module.mk.in 2010-05-12 14:44:42 UTC (rev 100)
@@ -3,7 +3,9 @@
PROGS += bin/cmpi-db
PROGS += bin/cmpi-db-quit
-CMPIDB_SRC += src/cmpi-db/cmpi-db-fifo-quit.c
+CMPIDB_SRC = src/cmpi-db/cmpi-db-fifo.c \
+ src/cmpi-db/cmpi-db-fifo-quit.c
+CMPIDB_OBJS = $(patsubst %.c, %.o, $(CMPIDB_SRC))
CMPIDB = bin/cmpi-db
Modified: test/cmpi-db/module.mk.in
===================================================================
--- test/cmpi-db/module.mk.in 2010-05-12 02:59:18 UTC (rev 99)
+++ test/cmpi-db/module.mk.in 2010-05-12 14:44:42 UTC (rev 100)
@@ -1,6 +1,6 @@
-TEST_CMPIDB_ZSH = $(shell find test/cmpi-db -name "*.zsh")
-TEST_CMPIDB_OUTPUT = $(patsubst %.zsh, %.out, $(TEST_CMPIDB_ZSH))
+TEST_CMPIDB_OUTPUT = test/cmpi-db/test-quit.out \
+ test/cmpi-db/test-cp1.out
TEST_OUTPUT += $(TEST_CMPIDB_OUTPUT)
Modified: test/driver/module.mk.in
===================================================================
--- test/driver/module.mk.in 2010-05-12 02:59:18 UTC (rev 99)
+++ test/driver/module.mk.in 2010-05-12 14:44:42 UTC (rev 100)
@@ -14,7 +14,10 @@
TEST_SRC += $(TEST_DRIVER_SRC)
TEST_OBJS += $(TEST_DRIVER_OBJS)
-TEST_PROGS += $(patsubst %.c, %.x, $(TEST_DRIVER_SRC))
+
+TEST_DRIVER_CMDS = $(shell find test/driver -name test-cmd*.c )
+TEST_PROGS += $(patsubst %.c, %.x, $(TEST_DRIVER_CMDS))
+TEST_PROGS += test/driver/test_driver.x
TEST_OUTPUT += $(TEST_DRIVER_OUTPUT)
TEST_DRIVER = test/driver/test_driver.x
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmw...@us...> - 2011-04-27 18:19:36
|
Revision: 196
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=196&view=rev
Author: jmwozniak
Date: 2011-04-27 18:19:30 +0000 (Wed, 27 Apr 2011)
Log Message:
-----------
Warnings fixes
Modified Paths:
--------------
test/driver/test-cmd-get.c
test/driver/test-cmd-put.c
Modified: test/driver/test-cmd-get.c
===================================================================
--- test/driver/test-cmd-get.c 2011-04-27 18:19:13 UTC (rev 195)
+++ test/driver/test-cmd-get.c 2011-04-27 18:19:30 UTC (rev 196)
@@ -50,7 +50,7 @@
// printf("read stream\n");
char* result = malloc(length*sizeof(char));
memset(result, 0, length);
- int total = stream_to_buffer(result, length, from_cmpi);
+ stream_to_buffer(result, length, from_cmpi);
if (strcmp(result, "hello"))
crash("wrong result!");
Modified: test/driver/test-cmd-put.c
===================================================================
--- test/driver/test-cmd-put.c 2011-04-27 18:19:13 UTC (rev 195)
+++ test/driver/test-cmd-put.c 2011-04-27 18:19:30 UTC (rev 196)
@@ -20,9 +20,6 @@
char* data = "hello";
- char output[32];
- int tmp;
-
accessor_put(key, data, strlen(data)+1);
return 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmw...@us...> - 2010-05-11 21:44:56
|
Revision: 92
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=92&view=rev
Author: jmwozniak
Date: 2010-05-11 21:44:50 +0000 (Tue, 11 May 2010)
Log Message:
-----------
Improve test-sleep case
Modified Paths:
--------------
Makefile.in
test/driver/test-cmd-sleep.c
test/driver/test-sleep.zsh
Modified: Makefile.in
===================================================================
--- Makefile.in 2010-05-11 21:36:05 UTC (rev 91)
+++ Makefile.in 2010-05-11 21:44:50 UTC (rev 92)
@@ -486,7 +486,8 @@
hex unhex hexord unpublish node driver \
$(TEST_OUTPUT) $(TEST_PROGS) $(TEST_OBJS) \
$(CMPI_PROGS) $(CMPI_CP_OBJS) splint.out
- $(E)find . -name "*.failed" -exec rm -fv \{\} \;
+ $(E)find . -name "*.failed" -exec rm -fv \{\} \;
+ $(E)find . -name "*.bombed" -exec rm -fv \{\} \;
$(E)find . -name "test-success.out" -exec rm -fv \{\} \;
# $(E)find . -name "*.avg" -exec rm -fv \{\} \;
# $(E)find . -name "*.per" -exec rm -fv \{\} \;
Modified: test/driver/test-cmd-sleep.c
===================================================================
--- test/driver/test-cmd-sleep.c 2010-05-11 21:36:05 UTC (rev 91)
+++ test/driver/test-cmd-sleep.c 2010-05-11 21:44:50 UTC (rev 92)
@@ -9,14 +9,25 @@
int
main(int argc, char* argv[])
{
- int error;
+ int code;
+ int seconds;
- driver_access_fifo();
+ if (argc < 2)
+ {
+ printf("test-cmd-sleep: needs seconds argument!\n");
+ exit(1);
+ }
- fprintf(to_cmpi, "sleep 3\n");
+ code = sscanf(argv[1], "%i", &seconds);
+ assert(code == 1);
+
+ code = driver_access_fifo();
+ assert(code);
+
+ fprintf(to_cmpi, "sleep %i\n", seconds);
fflush(to_cmpi);
char output[32];
- error = fscanf(from_cmpi, "%s", output);
+ fscanf(from_cmpi, "%s", output);
assert(!strcmp(output, "ok"));
Modified: test/driver/test-sleep.zsh
===================================================================
--- test/driver/test-sleep.zsh 2010-05-11 21:36:05 UTC (rev 91)
+++ test/driver/test-sleep.zsh 2010-05-11 21:44:50 UTC (rev 92)
@@ -1,17 +1,24 @@
#!/bin/zsh
+# Flex driver by issuing multiple simple commands
+
+OUTPUT=$1
+
mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
DRIVER_PID=${!}
-tools/timebomb.zsh ${$} 10 ${OUTPUT} $0
-BOMB1_PID=${!}
+tools/timebomb.zsh ${$} 15 ${OUTPUT} $0 &
+BOMB_PID=${!}
sleep 5
-print "Launching command quit..."
+test/driver/test-cmd-sleep.x 1
+test/driver/test-cmd-sleep.x 1
+test/driver/test-cmd-sleep.x 1
test/driver/test-cmd-quit.x
-wait
+wait ${DRIVER_PID}
+kill ${BOMB_PID}
N=$( grep -c "Normal exit" ${OUTPUT} )
if (( N != 5 ))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmw...@us...> - 2010-05-12 02:59:24
|
Revision: 99
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=99&view=rev
Author: jmwozniak
Date: 2010-05-12 02:59:18 +0000 (Wed, 12 May 2010)
Log Message:
-----------
Minor test fixes
Modified Paths:
--------------
Makefile.in
src/cmpi/driver.c
src/cmpi-cp/cmpi-cp.c
src/cmpi-cp/module.mk.in
test/cmpi-db/test-cp1.zsh
test/cmpi-db/test-quit.zsh
test/driver/test-cmd-get.c
Modified: Makefile.in
===================================================================
--- Makefile.in 2010-05-12 02:03:12 UTC (rev 98)
+++ Makefile.in 2010-05-12 02:59:18 UTC (rev 99)
@@ -438,7 +438,7 @@
# $(E)$(MPICC) src/cmpi/cmpi-io-test.o $(CMPI) $(LIBS) -o cmpi-io-test
# override default rule for building objects
-%.o : %.c
+%.o: %.c
$(Q) " MPICC $@"
$(E)$(MPICC) $(LIBCFLAGS) $(CFLAGS) $(TEST_OPTIONS) \
$(call modcflags,$(<)) $(<) -c -o $(@)
Modified: src/cmpi/driver.c
===================================================================
--- src/cmpi/driver.c 2010-05-12 02:03:12 UTC (rev 98)
+++ src/cmpi/driver.c 2010-05-12 02:59:18 UTC (rev 99)
@@ -133,6 +133,7 @@
buffer_to_stream(value, length, driver->sink);
}
fflush(driver->sink);
+ printf("driver: streamed\n");
DONE;
}
Modified: src/cmpi-cp/cmpi-cp.c
===================================================================
--- src/cmpi-cp/cmpi-cp.c 2010-05-12 02:03:12 UTC (rev 98)
+++ src/cmpi-cp/cmpi-cp.c 2010-05-12 02:59:18 UTC (rev 99)
@@ -117,17 +117,21 @@
fprintf(to_cmpi, "get %s\n", object);
fflush(to_cmpi);
- printf("issued get\n");
+ fscanf(from_cmpi, "%i\n", &length);
- fscanf(from_cmpi, "%i", &length);
- fgetc(from_cmpi);
if (length == -1)
return CMPI_DOESNT_EXIST;
- stream_to_buffer(data, length, from_cmpi);
- sscanf(data, "DHT: %i", &count);
- // printf("count: %i\n", count);
+ c = stream_to_buffer(data, length, from_cmpi);
+ c = sscanf(data, "DHT: %i\n", &count);
+ if (c != 1)
+ {
+ printf("bad response: %s\n", data);
+ exit(1);
+ }
+ printf("count: %i\n", count);
+
for (c = 0; c < count; c++)
{
fprintf(to_cmpi, "get %s[%i]\n", object, c);
@@ -205,6 +209,8 @@
int
main(int argc, char* argv[])
{
+ printf("\ncmpi-cp start\n\n");
+
CMPI_CP_TYPE target1_type;
CMPI_CP_TYPE target2_type;
Modified: src/cmpi-cp/module.mk.in
===================================================================
--- src/cmpi-cp/module.mk.in 2010-05-12 02:03:12 UTC (rev 98)
+++ src/cmpi-cp/module.mk.in 2010-05-12 02:59:18 UTC (rev 99)
@@ -12,7 +12,11 @@
CMPI_CP_LIBS += -L $(DMALLOC_LIB) -l dmalloc
endif
+src/cmpi-cp/cmpi-cp.o: src/cmpi-cp/cmpi-cp.c
+ $(Q) " CC $(@) "
+ $(E) $(CC) -c $(CFLAGS) $(<) -o $(@)
+
bin/cmpi-cp: $(CMPICP_OBJS)
- $(Q) " CC $(@) "
+ $(Q) " LINK $(@) "
$(E) install -d bin
$(E) $(CC) $(CMPICP_OBJS) -o $(@)
Modified: test/cmpi-db/test-cp1.zsh
===================================================================
--- test/cmpi-db/test-cp1.zsh 2010-05-12 02:03:12 UTC (rev 98)
+++ test/cmpi-db/test-cp1.zsh 2010-05-12 02:59:18 UTC (rev 99)
@@ -13,7 +13,7 @@
mpiexec -n ${PROCS} bin/cmpi-db -n ${NODES} >& ${OUTPUT} &
DB_PID=${!}
-tools/timebomb.zsh ${DB_PID} $(( PROCS*3 )) ${OUTPUT} $0 &
+tools/timebomb.zsh ${DB_PID} $(( PROCS*4 )) ${OUTPUT} $0 &
BOMB_PID=${!}
sleep ${PROCS}
@@ -37,17 +37,19 @@
crash "cmpi-cp error!"
fi
-bin/cmpi-db-quit >& /dev/null &
+bin/cmpi-db-quit >& /dev/null
QUIT_PROCESS=$!
+wait ${DB_PID}
+
+kill ${BOMB_PID}
+
sleep ${PROCS}
# Should be ${PROCS} "Normal exit."s
N=$( grep -c "Normal exit." ${OUTPUT} )
(( N == PROCS )) || crash "N != ${PROCS}"
-kill ${BOMB_PID}
-
rm -f cmpi-cp.out test-cp1.*.data
exit 0
Modified: test/cmpi-db/test-quit.zsh
===================================================================
--- test/cmpi-db/test-quit.zsh 2010-05-12 02:03:12 UTC (rev 98)
+++ test/cmpi-db/test-quit.zsh 2010-05-12 02:59:18 UTC (rev 99)
@@ -2,7 +2,7 @@
# Be sure to make tests with D=1
-set -x
+# set -x
OUTPUT=$1
PROCS=$2
@@ -15,7 +15,7 @@
sleep ${PROCS}
-bin/cmpi-db-fifo-quit >& /dev/null &
+bin/cmpi-db-quit >& /dev/null &
QUIT_PROCESS=$!
sleep ${PROCS}
Modified: test/driver/test-cmd-get.c
===================================================================
--- test/driver/test-cmd-get.c 2010-05-12 02:03:12 UTC (rev 98)
+++ test/driver/test-cmd-get.c 2010-05-12 02:59:18 UTC (rev 99)
@@ -39,9 +39,10 @@
code = fscanf(from_cmpi, "%i\n", &length);
if (code != 1)
crash("No response from driver!");
+ // printf("length: %i code: %i \n", length, code);
if (length == -1)
- crash("key not found");
+ crash("Key not found!");
char* result = malloc(length*sizeof(char));
memset(result, 0, length);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmw...@us...> - 2010-05-13 01:16:24
|
Revision: 110
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=110&view=rev
Author: jmwozniak
Date: 2010-05-13 01:16:17 +0000 (Thu, 13 May 2010)
Log Message:
-----------
Fixed tests
Modified Paths:
--------------
include/cmpi.h
src/cmpi/mode_rr.c
src/cmpi/module.mk.in
src/cmpi/node.c
src/dense-1/dense.c
src/mpirpc/mpirpc.c
test/cmpi/test-manyputs.c
test/cmpi/test-manyputs.zsh
test/cmpi/test-putget.c
test/cmpi/test-putget.zsh
test/cmpi/test-startup.c
test/cmpi/test-startup.zsh
test/cmpi/test-tables.c
test/cmpi/test-tables.zsh
test/cmpi/test-update01.zsh
test/cmpi/test-update02.zsh
test/cmpi/test_helpers.c
test/driver/test-quit.zsh
Modified: include/cmpi.h
===================================================================
--- include/cmpi.h 2010-05-12 23:55:08 UTC (rev 109)
+++ include/cmpi.h 2010-05-13 01:16:17 UTC (rev 110)
@@ -38,6 +38,8 @@
*/
extern int cmpi_cache_limit;
+extern int cmpi_nodes;
+
#define CMPI_BLOB_LENGTH LIST_MAX_DATUM
extern struct lru_table* cmpi_cache;
Modified: src/cmpi/mode_rr.c
===================================================================
--- src/cmpi/mode_rr.c 2010-05-12 23:55:08 UTC (rev 109)
+++ src/cmpi/mode_rr.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -10,6 +10,12 @@
int cmpi_mode_select(int rank, int size, int nodes)
{
NOTE("using mode_rr");
+ if (size%2 == 1)
+ {
+ printf("MPI size must be even for mode_rr!\n");
+ exit(1);
+ }
+
if (rank >= size/2)
return CMPI_MODE_CLIENT;
return CMPI_MODE_NODE;
@@ -26,3 +32,34 @@
return result;
}
+
+
+int cmpi_mode_next(int rank, int size, int nodes)
+{
+ int result;
+ int mode = cmpi_mode_select(rank, size, nodes);
+
+ if (mode == CMPI_MODE_NODE)
+ {
+ int next = rank+1;
+ if (next >= size/2)
+ result = -1;
+ else
+ result = next;
+ }
+ else
+ {
+ int next = rank+1;
+ if (next >= size)
+ result = -1;
+ else
+ result = next;
+ }
+
+ return result;
+}
+
+int cmpi_mode_first_client(int rank, int size, int nodes)
+{
+ return size/2;
+}
Modified: src/cmpi/module.mk.in
===================================================================
--- src/cmpi/module.mk.in 2010-05-12 23:55:08 UTC (rev 109)
+++ src/cmpi/module.mk.in 2010-05-13 01:16:17 UTC (rev 110)
@@ -7,8 +7,8 @@
CMPI_SRC += $(DIR)/driver.c
CMPI_SRC += $(DIR)/accessor.c
-MODE = $(DIR)/mode_mono.c
-#MODE = $(DIR)/mode_rr.c
+#MODE = $(DIR)/mode_mono.c
+MODE = $(DIR)/mode_rr.c
CMPI_SRC += $(MODE)
Modified: src/cmpi/node.c
===================================================================
--- src/cmpi/node.c 2010-05-12 23:55:08 UTC (rev 109)
+++ src/cmpi/node.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -14,7 +14,7 @@
#include <cmpi_mode.h>
#include <io_tools.h>
-int nodes;
+int cmpi_nodes;
MPI_Comm cmpi_comm_clients;
#ifdef DMALLOC
@@ -48,7 +48,7 @@
cmpi_cache_limit = 10000;
snooze_max = 500000;
debug_rank = mpi_rank;
- nodes = mpi_size;
+ cmpi_nodes = mpi_size;
cmpi_params_init();
while ((c =
@@ -73,7 +73,7 @@
exit(EXIT_FAILURE);
}
cmpi_params_add("nodes", optarg);
- nodes = t;
+ cmpi_nodes = t;
break;
case 'p':
p = strchr(optarg, '=');
@@ -137,13 +137,13 @@
// gossip_debug(MASK_CMPI, ":\n");
- if (mpi_size == nodes)
+ if (mpi_size == cmpi_nodes)
{
cmpi_comm_clients = MPI_COMM_NULL;
return;
}
- ranges[0][0] = nodes;
+ ranges[0][0] = cmpi_nodes;
ranges[0][1] = mpi_size-1;
ranges[0][2] = 1;
@@ -188,14 +188,17 @@
sleep(1);
+ /*
char hostname[128];
char* buffer;
int length = file_to_buffer(&buffer, "/etc/hostname");
memset(hostname, 0, 128);
memcpy(hostname, buffer, length);
NOTE_S("hostname: ", hostname);
-
- if (cmpi_mode_select(mpi_rank, mpi_size, nodes) == CMPI_MODE_NODE)
+ */
+
+ if (cmpi_mode_select(mpi_rank, mpi_size, cmpi_nodes) ==
+ CMPI_MODE_NODE)
{
NOTE("I am node");
cmpi_init();
@@ -220,7 +223,7 @@
#if USE_COMM_WORLD == 1
- if (mpi_rank < nodes)
+ if (mpi_rank < cmpi_nodes)
cmpi_cleanup();
else
cmpi_client_cleanup();
Modified: src/dense-1/dense.c
===================================================================
--- src/dense-1/dense.c 2010-05-12 23:55:08 UTC (rev 109)
+++ src/dense-1/dense.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -72,6 +72,7 @@
rpc_bootping()
{
int next = cmpi_mode_next(mpi_rank, mpi_size, dense_nodes);
+ NOTE_FI(next);
if (next > 0)
{
MPIRPC_Node node;
Modified: src/mpirpc/mpirpc.c
===================================================================
--- src/mpirpc/mpirpc.c 2010-05-12 23:55:08 UTC (rev 109)
+++ src/mpirpc/mpirpc.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -193,7 +193,7 @@
char* blob, int blob_length,
void* extras, void (*proceed)(MPIRPC*))
{
- gossip_do(MASK_MPIRPC, NOTE_F);
+ // gossip_do(MASK_MPIRPC, NOTE_F);
if (!name)
{
printf("MPIRPC_Call(): name was NULL. \n");
@@ -219,7 +219,7 @@
rpc->cancelled = false;
rpc->status = MPIRPC_STATUS_PROTO;
- gossip_do(MASK_MPIRPC, DONE);
+ // gossip_do(MASK_MPIRPC, DONE);
return rpc;
}
@@ -309,7 +309,7 @@
char*
MPIRPC_Block(MPIRPC_Node target, char* name, char* args)
{
- gossip_do(MASK_MPIRPC, NOTE_FS(name));
+ //gossip_do(MASK_MPIRPC, NOTE_FS(name));
return MPIRPC_Block_blob(target, name, args, NULL, 0);
}
Modified: test/cmpi/test-manyputs.c
===================================================================
--- test/cmpi/test-manyputs.c 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-manyputs.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -41,6 +41,8 @@
sleep((mpi_size-mpi_rank)*3+10);
+ cmpi_shutdown();
+ /*
int client_rank;
MPI_Comm_rank(cmpi_comm_clients, &client_rank);
if (client_rank == 0)
@@ -48,4 +50,5 @@
note("Shutting down...");
cmpi_shutdown();
}
+ */
}
Modified: test/cmpi/test-manyputs.zsh
===================================================================
--- test/cmpi/test-manyputs.zsh 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-manyputs.zsh 2010-05-13 01:16:17 UTC (rev 110)
@@ -14,9 +14,9 @@
if (( USE_COMM_WORLD == 1 ))
then
- # Monolithic execution (5 nodes, 1 client):
+ # Monolithic execution (3 nodes, 3 clients):
- mpiexec -n 6 ${PROGRAM} -n 5 -p reps=10 >& ${OUTPUT}
+ mpiexec -n 6 ${PROGRAM} -n 3 -p reps=10 >& ${OUTPUT}
CODE=$?
[[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
Modified: test/cmpi/test-putget.c
===================================================================
--- test/cmpi/test-putget.c 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-putget.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -8,14 +8,21 @@
void
cmpi_client_code()
{
+ NOTE_F;
+
+ wait_for_notification();
+ notify_next();
+
char key1[10];
char key2[10];
+
sprintf(key1, "key1_%i", mpi_rank);
sprintf(key2, "key2_%i", mpi_rank);
- wait_for_notification();
- notify_next();
+ sleep(mpi_rank);
+
+
char value[30];
strcpy(value, "value1");
cmpi_put(key1, value, strlen(value)+1);
Modified: test/cmpi/test-putget.zsh
===================================================================
--- test/cmpi/test-putget.zsh 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-putget.zsh 2010-05-13 01:16:17 UTC (rev 110)
@@ -14,9 +14,9 @@
if (( USE_COMM_WORLD == 1 ))
then
- # Monolithic execution (3 nodes, 2 clients):
+ # Monolithic execution (3 nodes, 3 clients):
- mpiexec -n 6 ${PROGRAM} -n 5 >& ${OUTPUT}
+ mpiexec -n 6 ${PROGRAM} -n 3 >& ${OUTPUT}
CODE=$?
[[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
Modified: test/cmpi/test-startup.c
===================================================================
--- test/cmpi/test-startup.c 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-startup.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -16,6 +16,6 @@
wait_for_notification();
notify_next();
- if (mpi_rank == mpi_size-1)
- cmpi_shutdown();
+ // if (mpi_rank == mpi_size-1)
+ cmpi_shutdown();
}
Modified: test/cmpi/test-startup.zsh
===================================================================
--- test/cmpi/test-startup.zsh 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-startup.zsh 2010-05-13 01:16:17 UTC (rev 110)
@@ -14,8 +14,8 @@
if (( USE_COMM_WORLD == 1 ))
then
- # KDA-2A execution (3 nodes, 2 clients):
- mpiexec -n 5 ${PROGRAM} -n 3 >& ${OUTPUT}
+ # KDA-2A execution (3 nodes, 3 clients):
+ mpiexec -n 6 ${PROGRAM} -n 3 >& ${OUTPUT}
CODE=$?
[[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
@@ -31,8 +31,8 @@
fi
-# Should be 5 "Normal exit."s
+# Should be 6 "Normal exit."s
N=$( grep -c "Normal exit." ${OUTPUT} )
-(( N == 5 )) || crash "N != 5"
+(( N == 6 )) || crash "N != 6"
exit 0
Modified: test/cmpi/test-tables.c
===================================================================
--- test/cmpi/test-tables.c 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-tables.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -19,6 +19,6 @@
sleep(mpi_rank);
- if (mpi_rank == mpi_size-1)
- cmpi_shutdown();
+ //if (mpi_rank == mpi_size-1)
+ cmpi_shutdown();
}
Modified: test/cmpi/test-tables.zsh
===================================================================
--- test/cmpi/test-tables.zsh 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-tables.zsh 2010-05-13 01:16:17 UTC (rev 110)
@@ -14,8 +14,8 @@
if (( USE_COMM_WORLD == 1 ))
then
- # KDA-2A execution (3 nodes, 2 clients):
- mpiexec -n 5 ${PROGRAM} -n 3 >& ${OUTPUT}
+ # KDA-2A execution (3 nodes, 3 clients):
+ mpiexec -n 6 ${PROGRAM} -n 3 >& ${OUTPUT}
CODE=$?
[[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
@@ -29,8 +29,8 @@
fi
-# Should be 5 "Normal exit."s
+# Should be 6 "Normal exit."s
N=$( grep -c "Normal exit." ${OUTPUT} )
-(( N == 5 )) || crash "N != 5"
+(( N == 6 )) || crash "N != 6"
exit 0
Modified: test/cmpi/test-update01.zsh
===================================================================
--- test/cmpi/test-update01.zsh 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-update01.zsh 2010-05-13 01:16:17 UTC (rev 110)
@@ -14,9 +14,9 @@
if (( USE_COMM_WORLD == 1 ))
then
- # Monolithic execution (5 nodes, 1 client):
+ # Monolithic execution (3 nodes, 3 clients):
- mpiexec -n 6 ${PROGRAM} -n 5 -p reps=10 >& ${OUTPUT}
+ mpiexec -n 6 ${PROGRAM} -n 3 -p reps=10 >& ${OUTPUT}
CODE=$?
[[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
Modified: test/cmpi/test-update02.zsh
===================================================================
--- test/cmpi/test-update02.zsh 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test-update02.zsh 2010-05-13 01:16:17 UTC (rev 110)
@@ -14,9 +14,9 @@
if (( USE_COMM_WORLD == 1 ))
then
- # Monolithic execution (5 nodes, 1 client):
+ # Monolithic execution (3 nodes, 3 clients):
- mpiexec -n 6 ${PROGRAM} -n 5 -p reps=10 >& ${OUTPUT}
+ mpiexec -n 6 ${PROGRAM} -n 3 -p reps=10 >& ${OUTPUT}
CODE=$?
[[ ${CODE} == 0 ]] || crash "exit code was: ${CODE}"
Modified: test/cmpi/test_helpers.c
===================================================================
--- test/cmpi/test_helpers.c 2010-05-12 23:55:08 UTC (rev 109)
+++ test/cmpi/test_helpers.c 2010-05-13 01:16:17 UTC (rev 110)
@@ -1,5 +1,6 @@
#include "test_helpers.h"
+#include <cmpi_mode.h>
/**
Print debugging header using machine-specific information.
@@ -39,7 +40,8 @@
notify_next(void)
{
NOTE_F;
- if (mpi_rank < mpi_size-1)
+ int next = cmpi_mode_next(mpi_rank, mpi_size, cmpi_nodes);
+ if (next >= 0)
{
int msg = -2;
MPI_Send(&msg, 1, MPI_INT,
Modified: test/driver/test-quit.zsh
===================================================================
--- test/driver/test-quit.zsh 2010-05-12 23:55:08 UTC (rev 109)
+++ test/driver/test-quit.zsh 2010-05-13 01:16:17 UTC (rev 110)
@@ -2,7 +2,7 @@
OUTPUT=$1
-mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
+mpiexec -n 6 test/driver/test_driver.x -n 3 > ${OUTPUT} &
DRIVER_PID=${!}
tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
@@ -16,7 +16,7 @@
kill ${BOMB_PID}
N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 5 ))
+if (( N != 6 ))
then
mv -v ${OUTPUT} ${OUTPUT}.failed
exit 1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmw...@us...> - 2010-05-14 20:00:33
|
Revision: 122
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=122&view=rev
Author: jmwozniak
Date: 2010-05-14 20:00:27 +0000 (Fri, 14 May 2010)
Log Message:
-----------
Update driver tests based on new CMPI mode
Modified Paths:
--------------
test/driver/module.mk.in
test/driver/test-get.zsh
test/driver/test-put.zsh
test/driver/test-quit.zsh
test/driver/test-sleep.zsh
Modified: test/driver/module.mk.in
===================================================================
--- test/driver/module.mk.in 2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/module.mk.in 2010-05-14 20:00:27 UTC (rev 122)
@@ -23,6 +23,14 @@
TEST_DRIVER = test/driver/test_driver.x
TEST_DRIVER_IMPL = test/driver/test_driver_fifo.o
+ifeq (@USE_CMPI_MODE@,MONO)
+ NODES := 5
+ CLIENTS := 1
+else
+ NODES := 3
+ CLIENTS := 3
+endif
+
$(TEST_DRIVER): $(TEST_DRIVER_IMPL) test/driver/test_helpers.o $(CMPI)
$(Q) " LINK $(@) "
$(E) $(MPICC) $(MPE) $(<) test/driver/test_helpers.o \
@@ -35,7 +43,7 @@
test/driver/test%.out: test/driver/test%.zsh $(TEST_PROGS) $(TEST_DRIVER)
$(Q) " TEST $(@) "
- $(E) $(<) $(@)
+ $(E) $(<) $(@) $(NODES) $(CLIENTS)
test/driver/test-success.out: test/cmpi/test-success.out \
$(TEST_DRIVER_OUTPUT)
Modified: test/driver/test-get.zsh
===================================================================
--- test/driver/test-get.zsh 2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/test-get.zsh 2010-05-14 20:00:27 UTC (rev 122)
@@ -3,7 +3,11 @@
# Put/get case
OUTPUT=$1
+NODES=$2
+CLIENTS=$3
+TOTAL=$(( NODES+CLIENTS ))
+
source tools/test-helpers.zsh
bail()
@@ -12,7 +16,7 @@
crash $1
}
-mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
+mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
DRIVER_PID=${!}
tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
@@ -29,11 +33,6 @@
wait ${DRIVER_PID}
kill ${BOMB_PID}
-N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 5 ))
-then
- mv -v ${OUTPUT} ${OUTPUT}.failed
- exit 1
-fi
+check_exits ${TOTAL} ${OUTPUT}
return 0
Modified: test/driver/test-put.zsh
===================================================================
--- test/driver/test-put.zsh 2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/test-put.zsh 2010-05-14 20:00:27 UTC (rev 122)
@@ -3,8 +3,14 @@
# Just do a put
OUTPUT=$1
+NODES=$2
+CLIENTS=$3
-mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
+TOTAL=$(( NODES+CLIENTS ))
+
+source tools/test-helpers.zsh
+
+mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
DRIVER_PID=${!}
tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
@@ -19,11 +25,6 @@
wait ${DRIVER_PID}
kill ${BOMB_PID}
-N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 5 ))
-then
- mv -v ${OUTPUT} ${OUTPUT}.failed
- exit 1
-fi
+check_exits ${TOTAL} ${OUTPUT}
return 0
Modified: test/driver/test-quit.zsh
===================================================================
--- test/driver/test-quit.zsh 2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/test-quit.zsh 2010-05-14 20:00:27 UTC (rev 122)
@@ -1,8 +1,14 @@
#!/bin/zsh
OUTPUT=$1
+NODES=$2
+CLIENTS=$3
-mpiexec -n 6 test/driver/test_driver.x -n 3 > ${OUTPUT} &
+TOTAL=$(( NODES+CLIENTS ))
+
+source tools/test-helpers.zsh
+
+mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
DRIVER_PID=${!}
tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
@@ -15,11 +21,6 @@
wait ${DRIVER_PID}
kill ${BOMB_PID}
-N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 6 ))
-then
- mv -v ${OUTPUT} ${OUTPUT}.failed
- exit 1
-fi
+check_exits ${TOTAL} ${OUTPUT}
return 0
Modified: test/driver/test-sleep.zsh
===================================================================
--- test/driver/test-sleep.zsh 2010-05-14 19:44:34 UTC (rev 121)
+++ test/driver/test-sleep.zsh 2010-05-14 20:00:27 UTC (rev 122)
@@ -1,10 +1,16 @@
#!/bin/zsh
-# Flex driver by issuing multiple simple commands
+# Flex driver by issuing simple commands
OUTPUT=$1
+NODES=$2
+CLIENTS=$3
-mpiexec -n 5 test/driver/test_driver.x -n 4 > ${OUTPUT} &
+TOTAL=$(( NODES+CLIENTS ))
+
+source tools/test-helpers.zsh
+
+mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
DRIVER_PID=${!}
tools/timebomb.zsh ${$} 15 ${OUTPUT} $0 &
@@ -20,11 +26,6 @@
wait ${DRIVER_PID}
kill ${BOMB_PID}
-N=$( grep -c "Normal exit" ${OUTPUT} )
-if (( N != 5 ))
-then
- mv -v ${OUTPUT} ${OUTPUT}.failed
- exit 1
-fi
+check_exits ${TOTAL} ${OUTPUT}
return 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jmw...@us...> - 2010-05-18 18:18:15
|
Revision: 130
http://c-mpi.svn.sourceforge.net/c-mpi/?rev=130&view=rev
Author: jmwozniak
Date: 2010-05-18 18:18:08 +0000 (Tue, 18 May 2010)
Log Message:
-----------
Simplify test/driver framework
Modified Paths:
--------------
test/driver/module.mk.in
test/driver/test-get.zsh
test/driver/test-put.zsh
test/driver/test-quit.zsh
test/driver/test-sleep.zsh
Modified: test/driver/module.mk.in
===================================================================
--- test/driver/module.mk.in 2010-05-18 18:17:40 UTC (rev 129)
+++ test/driver/module.mk.in 2010-05-18 18:18:08 UTC (rev 130)
@@ -43,7 +43,7 @@
test/driver/test%.out: test/driver/test%.zsh $(TEST_PROGS) $(TEST_DRIVER)
$(Q) " TEST $(@) "
- $(E) $(<) $(@) $(NODES) $(CLIENTS)
+ $(E) test/driver/test.zsh $(@) $(NODES) $(CLIENTS) $(<) $(CMPI_OPTS)
test/driver/test-success.out: test/cmpi/test-success.out \
$(TEST_DRIVER_OUTPUT)
Modified: test/driver/test-get.zsh
===================================================================
--- test/driver/test-get.zsh 2010-05-18 18:17:40 UTC (rev 129)
+++ test/driver/test-get.zsh 2010-05-18 18:18:08 UTC (rev 130)
@@ -1,38 +1,5 @@
-#!/bin/zsh
-
-# Put/get case
-
-OUTPUT=$1
-NODES=$2
-CLIENTS=$3
-
-TOTAL=$(( NODES+CLIENTS ))
-
-source tools/test-helpers.zsh
-
-bail()
-{
- kill ${BOMB_PID}
- crash $1
-}
-
-mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
-DRIVER_PID=${!}
-
-tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
-BOMB_PID=${!}
-
-sleep 5
-
test/driver/test-cmd-put.x sample-key
test/driver/test-cmd-sleep.x 1
test/driver/test-cmd-get.x sample-key
[[ $? == 0 ]] || bail "could not get: sample-key"
test/driver/test-cmd-quit.x
-
-wait ${DRIVER_PID}
-kill ${BOMB_PID}
-
-check_exits ${TOTAL} ${OUTPUT}
-
-return 0
Modified: test/driver/test-put.zsh
===================================================================
--- test/driver/test-put.zsh 2010-05-18 18:17:40 UTC (rev 129)
+++ test/driver/test-put.zsh 2010-05-18 18:18:08 UTC (rev 130)
@@ -1,30 +1,3 @@
-#!/bin/zsh
-
-# Just do a put
-
-OUTPUT=$1
-NODES=$2
-CLIENTS=$3
-
-TOTAL=$(( NODES+CLIENTS ))
-
-source tools/test-helpers.zsh
-
-mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
-DRIVER_PID=${!}
-
-tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
-BOMB_PID=${!}
-
-sleep 5
-
test/driver/test-cmd-put.x sample-key
test/driver/test-cmd-sleep.x 1
test/driver/test-cmd-quit.x
-
-wait ${DRIVER_PID}
-kill ${BOMB_PID}
-
-check_exits ${TOTAL} ${OUTPUT}
-
-return 0
Modified: test/driver/test-quit.zsh
===================================================================
--- test/driver/test-quit.zsh 2010-05-18 18:17:40 UTC (rev 129)
+++ test/driver/test-quit.zsh 2010-05-18 18:18:08 UTC (rev 130)
@@ -1,26 +1 @@
-#!/bin/zsh
-
-OUTPUT=$1
-NODES=$2
-CLIENTS=$3
-
-TOTAL=$(( NODES+CLIENTS ))
-
-source tools/test-helpers.zsh
-
-mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
-DRIVER_PID=${!}
-
-tools/timebomb.zsh ${$} 10 ${OUTPUT} $0 &
-BOMB_PID=${!}
-
-sleep 3
-
test/driver/test-cmd-quit.x
-
-wait ${DRIVER_PID}
-kill ${BOMB_PID}
-
-check_exits ${TOTAL} ${OUTPUT}
-
-return 0
Modified: test/driver/test-sleep.zsh
===================================================================
--- test/driver/test-sleep.zsh 2010-05-18 18:17:40 UTC (rev 129)
+++ test/driver/test-sleep.zsh 2010-05-18 18:18:08 UTC (rev 130)
@@ -1,31 +1,4 @@
-#!/bin/zsh
-
-# Flex driver by issuing simple commands
-
-OUTPUT=$1
-NODES=$2
-CLIENTS=$3
-
-TOTAL=$(( NODES+CLIENTS ))
-
-source tools/test-helpers.zsh
-
-mpiexec -n ${TOTAL} test/driver/test_driver.x -n ${NODES} > ${OUTPUT} &
-DRIVER_PID=${!}
-
-tools/timebomb.zsh ${$} 15 ${OUTPUT} $0 &
-BOMB_PID=${!}
-
-sleep 5
-
test/driver/test-cmd-sleep.x 1
test/driver/test-cmd-sleep.x 1
test/driver/test-cmd-sleep.x 1
test/driver/test-cmd-quit.x
-
-wait ${DRIVER_PID}
-kill ${BOMB_PID}
-
-check_exits ${TOTAL} ${OUTPUT}
-
-return 0
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X