From f41c524ca94c5d11ac2798cd04cab3ceafce96c9 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 20 Dec 2012 09:41:11 -0500
Subject: [svn-r23113] Added corrections to treat ";" character as text for
 comparision.

Tested: local linux
---
 config/cmake/prunTest.cmake | 24 ++++++++++++-----------
 config/cmake/runTest.cmake  | 47 +++++++++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/config/cmake/prunTest.cmake b/config/cmake/prunTest.cmake
index 5669138..91a2403 100644
--- a/config/cmake/prunTest.cmake
+++ b/config/cmake/prunTest.cmake
@@ -109,17 +109,19 @@ IF (NOT TEST_SKIP_COMPARE)
   LIST (LENGTH test_act len_act)
   FILE (STRINGS ${TEST_FOLDER}/P_${TEST_REFERENCE} test_ref)
   LIST (LENGTH test_ref len_ref)
-  MATH (EXPR _FP_LEN "${len_ref} - 1")
-  FOREACH (line RANGE 0 ${_FP_LEN})
-    LIST (GET test_act ${line} str_act)
-    LIST (GET test_ref ${line} str_ref)
-    IF (NOT ${str_act} STREQUAL ${str_ref})
-      IF (NOT ${str_act} STREQUAL "")
-        SET (TEST_RESULT 1)
-        MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-       ENDIF (NOT ${str_act} STREQUAL "")
-    ENDIF (NOT ${str_act} STREQUAL ${str_ref})
-  ENDFOREACH (line RANGE 0 ${_FP_LEN})
+  IF (NOT ${len_act} STREQUAL "0")
+    MATH (EXPR _FP_LEN "${len_ref} - 1")
+    FOREACH (line RANGE 0 ${_FP_LEN})
+      LIST (GET test_act ${line} str_act)
+      LIST (GET test_ref ${line} str_ref)
+      IF (NOT "${str_act}" STREQUAL "${str_ref}")
+        IF (NOT "${str_act}" STREQUAL "")
+          SET (TEST_RESULT 1)
+          MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+         ENDIF (NOT "${str_act}" STREQUAL "")
+      ENDIF (NOT "${str_act}" STREQUAL "${str_ref}")
+    ENDFOREACH (line RANGE 0 ${_FP_LEN})
+  ENDIF (NOT ${len_act} STREQUAL "0")
   IF (NOT ${len_act} STREQUAL ${len_ref})
     SET (TEST_RESULT 1)
   ENDIF (NOT ${len_act} STREQUAL ${len_ref})
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index d53f23e..7735e9b 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -114,17 +114,19 @@ IF (NOT TEST_SKIP_COMPARE)
   LIST (LENGTH test_act len_act)
   FILE (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
   LIST (LENGTH test_ref len_ref)
-  MATH (EXPR _FP_LEN "${len_ref} - 1")
-  FOREACH (line RANGE 0 ${_FP_LEN})
-    LIST (GET test_act ${line} str_act)
-    LIST (GET test_ref ${line} str_ref)
-    IF (NOT ${str_act} STREQUAL ${str_ref})
-      IF (NOT ${str_act} STREQUAL "")
-        SET (TEST_RESULT 1)
-        MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-       ENDIF (NOT ${str_act} STREQUAL "")
-    ENDIF (NOT ${str_act} STREQUAL ${str_ref})
-  ENDFOREACH (line RANGE 0 ${_FP_LEN})
+  IF (NOT ${len_act} STREQUAL "0")
+    MATH (EXPR _FP_LEN "${len_ref} - 1")
+    FOREACH (line RANGE 0 ${_FP_LEN})
+      LIST (GET test_act ${line} str_act)
+      LIST (GET test_ref ${line} str_ref)
+      IF (NOT "${str_act}" STREQUAL "${str_ref}")
+        IF (NOT "${str_act}" STREQUAL "")
+          SET (TEST_RESULT 1)
+          MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+         ENDIF (NOT "${str_act}" STREQUAL "")
+      ENDIF (NOT "${str_act}" STREQUAL "${str_ref}")
+    ENDFOREACH (line RANGE 0 ${_FP_LEN})
+  ENDIF (NOT ${len_act} STREQUAL "0")
   IF (NOT ${len_act} STREQUAL ${len_ref})
     SET (TEST_RESULT 1)
   ENDIF (NOT ${len_act} STREQUAL ${len_ref})
@@ -149,16 +151,19 @@ IF (NOT TEST_SKIP_COMPARE)
     FILE (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
     LIST (LENGTH test_ref len_ref)
     MATH (EXPR _FP_LEN "${len_ref} - 1")
-    FOREACH (line RANGE 0 ${_FP_LEN})
-      LIST (GET test_act ${line} str_act)
-      LIST (GET test_ref ${line} str_ref)
-    IF (NOT ${str_act} STREQUAL ${str_ref})
-      IF (NOT ${str_act} STREQUAL "")
-        SET (TEST_RESULT 1)
-        MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
-       ENDIF (NOT ${str_act} STREQUAL "")
-    ENDIF (NOT ${str_act} STREQUAL ${str_ref})
-    ENDFOREACH (line RANGE 0 ${_FP_LEN})
+    IF (NOT ${len_act} STREQUAL "0")
+      MATH (EXPR _FP_LEN "${len_ref} - 1")
+      FOREACH (line RANGE 0 ${_FP_LEN})
+        LIST (GET test_act ${line} str_act)
+        LIST (GET test_ref ${line} str_ref)
+        IF (NOT "${str_act}" STREQUAL "${str_ref}")
+          IF (NOT "${str_act}" STREQUAL "")
+            SET (TEST_RESULT 1)
+            MESSAGE ("line = ${line}\n***ACTUAL: ${str_act}\n****REFER: ${str_ref}\n")
+           ENDIF (NOT "${str_act}" STREQUAL "")
+        ENDIF (NOT "${str_act}" STREQUAL "${str_ref}")
+      ENDFOREACH (line RANGE 0 ${_FP_LEN})
+    ENDIF (NOT ${len_act} STREQUAL "0")
     IF (NOT ${len_act} STREQUAL ${len_ref})
       SET (TEST_RESULT 1)
     ENDIF (NOT ${len_act} STREQUAL ${len_ref})
-- 
cgit v0.12