[C-MPI-commits] SF.net SVN: c-mpi:[80] test

[<jmw...@us...>]

Revision: 80
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=80&view=rev
Author:   jmwozniak
Date:     2010-05-10 19:46:14 +0000 (Mon, 10 May 2010)

Log Message:
-----------
Fixes to tests.

Modified Paths:
--------------
    test/cmpi-db/test-quit.zsh
    test/mpirpc/module.mk.in
    test/mpirpc/test-args.zsh
    test/mpirpc/test-blob.c
    test/mpirpc/test-blob.zsh
    test/mpirpc/test-ping.c
    test/mpirpc/test-ping.zsh
    test/mpirpc/test-returns.zsh

Modified: test/cmpi-db/test-quit.zsh
===================================================================
--- test/cmpi-db/test-quit.zsh	2010-05-07 21:57:23 UTC (rev 79)
+++ test/cmpi-db/test-quit.zsh	2010-05-10 19:46:14 UTC (rev 80)
@@ -2,7 +2,7 @@
 
 # Be sure to make tests with D=1
 
-# set -x
+set -x
 
 OUT=$1
 PROCS=$2

Modified: test/mpirpc/module.mk.in
===================================================================
--- test/mpirpc/module.mk.in	2010-05-07 21:57:23 UTC (rev 79)
+++ test/mpirpc/module.mk.in	2010-05-10 19:46:14 UTC (rev 80)
@@ -10,9 +10,10 @@
 TEST_OUTPUT     += $(patsubst %.c, %.out, $(TEST_MPIRPC_SRC))
 
 test/mpirpc/test%.out: test/mpirpc/test%.x
-	mpdlistjobs
-	$(patsubst %.x, %.zsh, $(<)) $(<) $(LAUNCH)
-	cp -uv $(@) test/mpirpc/readable.txt
+	$(Q) "  TEST		$(@) "
+	$(E)mpdlistjobs
+	$(E) $(patsubst %.x, %.zsh, $(<)) $(<) $(LAUNCH)
+#	cp -uv $(@) test/mpirpc/readable.txt
 
 $(DIR)/test%.x: $(DIR)/test%.o $(CMPI)
 	$(Q) "  MPICC		$(@) "

Modified: test/mpirpc/test-args.zsh
===================================================================
--- test/mpirpc/test-args.zsh	2010-05-07 21:57:23 UTC (rev 79)
+++ test/mpirpc/test-args.zsh	2010-05-10 19:46:14 UTC (rev 80)
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-set -x
+# set -x
 
 # Be sure to make tests with D=1
 
@@ -30,7 +30,7 @@
 
 for T in ${TOKENS}
 do
-  grep ${T} ${OUT} || crash "Not found: ${T}"
+  grep ${T} ${OUT} > /dev/null || crash "Not found: ${T}"
 done
 
 exit 0

Modified: test/mpirpc/test-blob.c
===================================================================
--- test/mpirpc/test-blob.c	2010-05-07 21:57:23 UTC (rev 79)
+++ test/mpirpc/test-blob.c	2010-05-10 19:46:14 UTC (rev 80)
@@ -20,7 +20,7 @@
   assert(blob[2] == '\t');
   assert(blob[3] == '\n');
 
-  NOTE("asserts ok");
+  printf("asserts ok\n");
 
   MPIRPC_Null(caller, unique);
   if (args)
@@ -60,7 +60,7 @@
     while (! MPIRPC_Check());
   }
 
-  NOTE("Normal exit.\n");
+  printf("Normal exit.\n");
   MPIRPC_Finalize();
   MPI_Finalize();
 

Modified: test/mpirpc/test-blob.zsh
===================================================================
--- test/mpirpc/test-blob.zsh	2010-05-07 21:57:23 UTC (rev 79)
+++ test/mpirpc/test-blob.zsh	2010-05-10 19:46:14 UTC (rev 80)
@@ -25,7 +25,7 @@
 
 for T in ${TOKENS}
 do
-  grep ${T} ${OUT} || crash "Not found: ${T}"
+  grep ${T} ${OUT} > /dev/null || crash "Not found: ${T}"
 done
 
 # Should be 2 "Normal exit."s

Modified: test/mpirpc/test-ping.c
===================================================================
--- test/mpirpc/test-ping.c	2010-05-07 21:57:23 UTC (rev 79)
+++ test/mpirpc/test-ping.c	2010-05-10 19:46:14 UTC (rev 80)
@@ -43,7 +43,8 @@
 int
 main(int argc, char* argv[])
 {
-  printf("host: %s\n", file_string("/etc/hostname"));
+  printf("hello\n");
+  // printf("host: %s\n", file_string("/etc/hostname"));
 
   MPI_Init(&argc, &argv);
 

Modified: test/mpirpc/test-ping.zsh
===================================================================
--- test/mpirpc/test-ping.zsh	2010-05-07 21:57:23 UTC (rev 79)
+++ test/mpirpc/test-ping.zsh	2010-05-10 19:46:14 UTC (rev 80)
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-set -x
+# set -x
 
 # Be sure to make tests with D=1
 
@@ -24,7 +24,7 @@
 N=$( grep -c "handle_ping" ${OUT} )
 (( N == 5 )) || crash "N != 6"
 
-grep "handle_quit" ${OUT} || crash "No handle_quit!"
+grep "handle_quit" ${OUT} > /dev/null || crash "No handle_quit!"
 
 # Should be 2 "Normal exit."s
 N=$( grep -c "Normal exit." ${OUT} )

Modified: test/mpirpc/test-returns.zsh
===================================================================
--- test/mpirpc/test-returns.zsh	2010-05-07 21:57:23 UTC (rev 79)
+++ test/mpirpc/test-returns.zsh	2010-05-10 19:46:14 UTC (rev 80)
@@ -1,6 +1,6 @@
 #!/bin/zsh
 
-set -x
+# set -x
 
 # Be sure to make tests with D=1
 
@@ -25,7 +25,7 @@
 
 for T in ${TOKENS}
 do
-  grep ${T} ${OUT} || crash "Not found: ${T}"
+  grep ${T} ${OUT} > /dev/null || crash "Not found: ${T}"
 done
 
 exit 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.