Changeset 18

Timestamp:

Apr 15, 2009, 10:14:21 AM (17 years ago)

Author:

buchmann

Message:

Fix:

• Disable checkings about the SOCVIEW environment variable. SOCVIEW is optional.
• Add missing system header includes
• Add some potential signal order and signal graph to the testbench 29032005
• Add a new testbench : 15042009
  • Check sc_uint operators with size = 36 (> 32)

Location:

sources/test_regression

Files:

• 15032005 (deleted)
• 15042009 (added)
• 15042009/Makefile (added)
• 15042009/system.cpp (added)
• 16122005/system.cpp (modified) (1 diff)
• 17032005/system.cpp (modified) (1 diff)
• 23022007 (deleted)
• 25032005/Makefile (modified) (1 diff)
• 28102005/system.cpp (modified) (1 diff)
• 29032005/Makefile (modified) (1 diff)
• 29032005/process_order_reference3.dot (added)
• 29032005/signal_graph_reference3.dot (added)
• 29032005/signal_order_reference3.txt (added)
• Makefile (modified) (2 diffs)
• env.mk (modified) (1 diff)

sources/test_regression/16122005/system.cpp

@@ -3 +3 @@
 #include <fstream>
 #include <vector>
+#include <cstring> //strcmp
 
 #define ASSERT(x) { if (!(x)) { \

sources/test_regression/17032005/system.cpp

@@ -3 +3 @@
 #include <iostream>
 #include <fstream>
+#include <cstdlib> //exit
 
 #define ASSERT(x) \

sources/test_regression/25032005/Makefile

@@ -14 +14 @@
         ./system_systemc.x ; \
         ./system_systemcass.x --p --t || eval ${failcom} ; \
-        ((tail --lines=+3 signal_graph.dot  | diff signal_graph_reference.dot -)\
-        || (tail -n +3 signal_graph.dot | diff signal_graph_reference2.dot -)) \
-        || eval ${failcom} ; \
-        
+        ((tail --lines=+3 signal_graph.dot  | diff signal_graph_reference.dot -) || (tail -n +3 signal_graph.dot | diff signal_graph_reference2.dot -)) || eval ${failcom}
         tail --lines=+3 process_order.dot | diff process_order_reference.dot -
         diff signal_order_reference.txt signal_order.txt

sources/test_regression/28102005/system.cpp

@@ -1 +1 @@
 #include "systemc.h"
 #include <iostream>
-#include <string>
+#include <cstring>
 
 #define ASSERT(x) \

sources/test_regression/29032005/Makefile

@@ -16 +16 @@
   (tail -n +3 port_graph.dot | diff port_graph_reference.dot -) || eval ${failcom} ; \
   ((tail -n +3 signal_graph.dot | diff signal_graph_reference.dot -) \
-  || (tail -n +3 signal_graph.dot | diff signal_graph_reference2.dot -)) \
+  || (tail -n +3 signal_graph.dot | diff signal_graph_reference2.dot -) \
+  || (tail -n +3 signal_graph.dot | diff signal_graph_reference3.dot -)) \
   || eval ${failcom} ; \
   ((tail -n +3 process_order.dot | diff process_order_reference.dot -) \
-  || (tail -n +3 process_order.dot | diff process_order_reference2.dot -)) \
+  || (tail -n +3 process_order.dot | diff process_order_reference2.dot -)  \
+  || (tail -n +3 process_order.dot | diff process_order_reference3.dot -)) \
   || eval ${failcom} ; \
   (diff signal_order_reference.txt signal_order.txt) \
   || (diff signal_order_reference2.txt signal_order.txt) \
+  || (diff signal_order_reference3.txt signal_order.txt) \
   || eval ${failcom} ; \
   done

sources/test_regression/Makefile

@@ -45 +45 @@
 # 16022007  : check --nobanner option
 # 23032007  : check multiple execution on the same computer
+# 15042009  : check sc_uint operators (==, =, <<=, +=)
 
 ## Uncomment the following variable if you want to compile and run the 
@@ -81 +82 @@
       20122006 \
       16022007 \
+      15042009 \
       ${SOCVIEW_TEST} \
 #

sources/test_regression/env.mk

@@ -63 +63 @@
 $(error SYSTEMCASS is not defined.)
 endif
-ifndef SOCVIEW
-$(error SOCVIEW is not defined.)
-endif
+#ifndef SOCVIEW
+#$(error SOCVIEW is not defined. This environment variable is optional.)
+#endif
 
 failcom   = 'exit 1'