From c478aa74ddce830a7bcf6b51ab37fc119ec4d5c4 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Thu, 16 Sep 2004 17:52:37 +0000
Subject: [PATCH] turned off automatic compilation during make test for windows
 machines.

---
 test_problems/diamondSurf/Makefile.in  | 10 +++++++++-
 test_problems/silane_equil/Makefile.in | 10 ++++++++++
 test_problems/surfkin/Makefile.in      | 10 +++++++++-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/test_problems/diamondSurf/Makefile.in b/test_problems/diamondSurf/Makefile.in
index 597d84311..48f15b6a9 100644
--- a/test_problems/diamondSurf/Makefile.in
+++ b/test_problems/diamondSurf/Makefile.in
@@ -23,6 +23,9 @@ LINK_OPTIONS =
 
 #############################################################################
 
+# Check to see whether we are in the msvc++ environment
+os_is_win = @OS_IS_WIN@
+
 # Fortran libraries
 FORT_LIBS = @FLIBS@
 
@@ -78,9 +81,14 @@ depends:
 .depends: $(DEPENDS)
 	cat *.d > .depends
 
-# test target -> make the program and run the test
+# Do the test -> For the windows vc++ environment, we have to skip checking on
+#                whether the program is uptodate, because we don't utilize make
+#                in that environment to build programs.
 test:
+ifeq ($(os_is_win), 1)
+else
 	@MAKE@ $(PROGRAM)
+endif
 	./runtest
 
 # clean target -> clean up
diff --git a/test_problems/silane_equil/Makefile.in b/test_problems/silane_equil/Makefile.in
index d7caf3f5e..ab55ce708 100644
--- a/test_problems/silane_equil/Makefile.in
+++ b/test_problems/silane_equil/Makefile.in
@@ -23,6 +23,9 @@ LINK_OPTIONS =
 
 #############################################################################
 
+# Check to see whether we are in the msvc++ environment
+os_is_win = @OS_IS_WIN@
+
 # Fortran libraries
 FORT_LIBS = @FLIBS@
 
@@ -76,9 +79,16 @@ depends:
 .depends: $(DEPENDS)
 	cat *.d > .depends
 
+# Do the test -> For the windows vc++ environment, we have to skip checking on
+#                whether the program is uptodate, because we don't utilize make
+#                in that environment to build programs.
 test:
+ifeq ($(os_is_win), 1)
+else
 	@MAKE@ $(PROGRAM)
+endif
 	./runtest
+
 clean:
 	$(RM) $(OBJS) $(PROGRAM) $(DEPENDS) .depends
 	../../bin/rm_cvsignore
diff --git a/test_problems/surfkin/Makefile.in b/test_problems/surfkin/Makefile.in
index 26b68a245..7a0d2d110 100644
--- a/test_problems/surfkin/Makefile.in
+++ b/test_problems/surfkin/Makefile.in
@@ -21,7 +21,8 @@ LINK_OPTIONS =
 
 #############################################################################
 
-                                                                                     
+# Check to see whether we are in the msvc++ environment 
+os_is_win = @OS_IS_WIN@
 
 # Fortran libraries
 FORT_LIBS = @FLIBS@
@@ -78,9 +79,16 @@ depends:
 .depends: $(DEPENDS)
 	cat *.d > .depends
 
+# Do the test -> For the windows vc++ environment, we have to skip checking on
+#                whether the program is uptodate, because we don't utilize make
+#                in that environment to build programs.
 test:
+ifeq ($(os_is_win), 1)
+else
 	@MAKE@ $(PROGRAM)
+endif
 	./runtest
+
 clean:
 	$(RM) $(OBJS) $(PROGRAM)
 	../../bin/rm_cvsignore