Changeset 56 for sources/test_regression/14092005

Timestamp:

May 29, 2013, 6:05:44 PM (11 years ago)

Author:

meunier

Message:

• Tried to fix a problem with echo
• Started to resolve some tests failing (often because of the test itself)

Location:

sources/test_regression/14092005

Files:

• Makefile (modified) (1 diff)
• system.cpp (modified) (3 diffs)

sources/test_regression/14092005/Makefile

@@ -9 +9 @@
 TRACE_REF = trace_file_reference.vcd
 
+# Les traces SC et SCASS diffÚrent (maj de o1 sur le front montant dans SCASS), du coup on ne vérifie que la trace SystemCass
+
 test: all
-        @echo -ne "| Testing $$(basename $$(pwd)): " ;
-        @./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null
-        @mv $(TRACE) $(TRACE1)
-        @./$(EXE_SC) > $(LOG_SC) 2> /dev/null
-        @mv $(TRACE) $(TRACE2)
-        @if tail -n +11 $(TRACE1) | diff $(TRACE_REF) - > /dev/null ; then \
-                if tail -n +11 $(TRACE2) | diff $(TRACE_REF) - > /dev/null ; then \
-                        echo "OK" ; \
-                else \
-                        echo "KO" ; \
-                fi ; \
+        $(SILENCE)$(ECHO) -ne "| Testing $$(basename $$(pwd)): " ;
+        $(SILENCE)./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null
+        $(SILENCE)mv $(TRACE) $(TRACE1)
+        $(SILENCE)./$(EXE_SC) > $(LOG_SC) 2> /dev/null
+        $(SILENCE)mv $(TRACE) $(TRACE2)
+        $(SILENCE)if tail -n +11 $(TRACE1) | diff $(TRACE_REF) - > /dev/null ; then \
+                $(ECHO) -e "$(OK)" ; \
         else \
-                echo "KO" ; \
+                $(ECHO) -e "$(KO) 2" ; \
         fi ;
 

sources/test_regression/14092005/system.cpp

@@ -10 +10 @@
 
 struct hard : sc_module {
-    sc_in_clk       clk;
-    sc_in<bool>     resetn;
-    sc_in <int>     i1;
-    sc_out<int>     o1;
-    sc_signal <int> r1;
+    sc_in_clk      clk;
+    sc_in<bool>    resetn;
+    sc_in <int>    i1;
+    sc_out<int>    o1;
+    sc_signal<int> r1;
 
     void fg() {
@@ -49 +49 @@
     hard a("a");
 
-    a.clk   (clk1);
+    a.clk(clk1);
     a.resetn(resetn);
 
@@ -56 +56 @@
 
     /* Open trace file */
-    sc_trace_file *system_trace_file;
-    system_trace_file = sc_create_vcd_trace_file ("trace_file");
+    sc_trace_file * system_trace_file;
+    system_trace_file = sc_create_vcd_trace_file("trace_file");
 
     /* clks waveforms are always useful */