[Scstudio-commits] SF.net SVN: scstudio:[465] trunk

[<got...@us...>]

Revision: 465
          http://scstudio.svn.sourceforge.net/scstudio/?rev=465&view=rev
Author:   gotthardp
Date:     2009-11-17 13:36:54 +0000 (Tue, 17 Nov 2009)

Log Message:
-----------
Fixed memory checking of Z.120 tests. Fixed a minor gcc warning.

Modified Paths:
--------------
    trunk/src/data/dfs_hmsc_flat_traverser.h
    trunk/tests/z120_test/z120_diff.py

Modified: trunk/src/data/dfs_hmsc_flat_traverser.h
===================================================================
--- trunk/src/data/dfs_hmsc_flat_traverser.h	2009-11-17 12:09:45 UTC (rev 464)
+++ trunk/src/data/dfs_hmsc_flat_traverser.h	2009-11-17 13:36:54 UTC (rev 465)
@@ -89,12 +89,15 @@
 class SCMSC_EXPORT TraverseHMscStartListener
 {
 public:
+  virtual ~TraverseHMscStartListener() {}
+
   virtual void on_hmsc_traverse_start(HMscPtr)=0;
 };
 
 class SCMSC_EXPORT TraverseHMscFinishListener
 {
 public:
+  virtual ~TraverseHMscFinishListener() {}
 
   virtual void on_hmsc_traverse_finish(HMscPtr)=0;
 };

Modified: trunk/tests/z120_test/z120_diff.py
===================================================================
--- trunk/tests/z120_test/z120_diff.py	2009-11-17 12:09:45 UTC (rev 464)
+++ trunk/tests/z120_test/z120_diff.py	2009-11-17 13:36:54 UTC (rev 465)
@@ -10,16 +10,23 @@
   sys.exit(exit)
 
 else:
-  f = open(sys.argv[2] + ".result", "rt")
+  expected_output = open(sys.argv[2] + ".result", "rt")
 
-  result = difflib.unified_diff(f.readlines(), p.stderr.readlines()+ p.stdout.readlines())
+  output = p.stderr.readlines() + p.stdout.readlines()
+  # print the output as it may contain valgrind error reports
+  for line in output:
+    print line,
 
-  error = False
-  for line in  result:
+  result = difflib.unified_diff(expected_output.readlines(), output)
+  result_lines = 0
+  # print the differences between the real and the expected output
+  for line in result:
+    if result_lines == 0:
+      print "----------------------------------------------------------"
+
     print line,
-    error = True
+    result_lines = result_lines + 1
 
-  sys.exit(error)
+  sys.exit(result_lines)
 
-
 # $Id: z120_test.cpp 298 2009-09-09 20:20:52Z madzin $


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