[mpich2-commits] r9540 - mpich2/trunk/test/mpi/manual

[gropp at mcs.anl.gov]

Author: gropp
Date: 2012-02-27 11:44:25 -0600 (Mon, 27 Feb 2012)
New Revision: 9540

Modified:
   mpich2/trunk/test/mpi/manual/Makefile.am
   mpich2/trunk/test/mpi/manual/testconnectserial.c
Log:
Add connectstuff.h to known files, needed for dist target, and update testconnectserial to work without MPICHLIBSTR defintion, which was only used for debugging

Modified: mpich2/trunk/test/mpi/manual/Makefile.am
===================================================================
--- mpich2/trunk/test/mpi/manual/Makefile.am	2012-02-27 17:42:35 UTC (rev 9539)
+++ mpich2/trunk/test/mpi/manual/Makefile.am	2012-02-27 17:44:25 UTC (rev 9540)
@@ -11,12 +11,11 @@
                   spawntest_master spawntest_child segfault \
                   mpit_test mpit_test2
 
-testconnectserial_SOURCES = testconnectserial.c tchandlers.c tcutil.c
+# testconnectserial would like MPICHLIBSTR to be defined as the installation
+# directory of the MPI library.  This definition is not required.
+noinst_HEADERS = connectstuff.h
+testconnectserial_SOURCES = testconnectserial.c tchandlers.c tcutil.c 
 testconnectserial_LDADD   = $(LDADD) -lm
 
-## why does this override rule exist in the simplemake version?
-##testconnectserial.o: testconnectserial.c
-##	$(C_COMPILE) -c -DMPICHLIBSTR=\"$(MPIDIR)\" $<
-
 CLEANFILES += test-port
 

Modified: mpich2/trunk/test/mpi/manual/testconnectserial.c
===================================================================
--- mpich2/trunk/test/mpi/manual/testconnectserial.c	2012-02-27 17:42:35 UTC (rev 9539)
+++ mpich2/trunk/test/mpi/manual/testconnectserial.c	2012-02-27 17:44:25 UTC (rev 9540)
@@ -24,7 +24,9 @@
     int rankToAccept = 1;
 
     /* Debug - print out where we picked up the MPICH build from */
+#ifdef MPICHLIBSTR
     msg( "MPICH library taken from: %s\n", MPICHLIBSTR );
+#endif
 
     if( argc != 4 ) {
         printf( "Usage: %s <fname> <totalSize> <idx-1-based>\n", argv[0] );