From d021f3f7dc6b527caff5e2b4c704e34c09a0e493 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 10 Aug 2004 01:06:57 +0000
Subject: [PATCH] MSVC differences no longer matter.

---
 test_problems/diamondSurf/.cvsignore | 4 ++++
 test_problems/diamondSurf/runtest    | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test_problems/diamondSurf/.cvsignore b/test_problems/diamondSurf/.cvsignore
index dd87e46ad..d23c0e8e1 100644
--- a/test_problems/diamondSurf/.cvsignore
+++ b/test_problems/diamondSurf/.cvsignore
@@ -10,3 +10,7 @@ xml_diff_test.out
 *.d
 .cttmp.py
 runDiamond.ilk
+diamondSurf.pdb
+diamonda.xml
+outputa.txt
+test.xml
diff --git a/test_problems/diamondSurf/runtest b/test_problems/diamondSurf/runtest
index 4fc07a91c..57ecfa568 100755
--- a/test_problems/diamondSurf/runtest
+++ b/test_problems/diamondSurf/runtest
@@ -3,7 +3,7 @@
 #
 
 temp_success="1"
-/bin/rm  -f output.txt
+/bin/rm  -f output.txt outputa.txt diamond.xml diamonda.xml
 
 #################################################################
 #
@@ -19,8 +19,8 @@ then
   echo "runDiamond returned with bad status, $retnStat, check output"
 fi
 
-
-diff output.txt runDiamond_blessed.out > diff_test.out
+../../bin/exp3to2.sh output.txt > outputa.txt
+diff -w outputa.txt runDiamond_blessed.out > diff_test.out
 retnStat=$?
 if [ $retnStat = "0" ]
 then
@@ -31,7 +31,8 @@ else
   temp_success="0"
 fi
 
-diff diamond.xml diamond_blessed.xml > xml_diff_test.out
+../../bin/exp3to2.sh diamond.xml > diamonda.xml
+diff -w diamonda.xml diamond_blessed.xml > xml_diff_test.out
 retnStat=$?
 if [ $retnStat = "0" ]
 then