Changeset 56 for sources/test_regression/09092005c

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/09092005c

Files:

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

sources/test_regression/09092005c/Makefile

@@ -4 +4 @@
 
 test: all
-        @echo -ne "| Testing $$(basename $$(pwd)): " ;
-        @./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null
-        @./$(EXE_SC) > $(LOG_SC) 2> /dev/null
-        @if diff $(LOG_SC) $(LOG_SCASS) > /dev/null ; then \
-    echo "OK" ; \
-    else echo "KO" ; \
+        $(SILENCE)$(ECHO) -ne "| Testing $$(basename $$(pwd)): " ;
+        $(SILENCE)./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null
+        $(SILENCE)./$(EXE_SC) > $(LOG_SC) 2> /dev/null
+        $(SILENCE)if diff $(LOG_SC) $(LOG_SCASS) > /dev/null ; then \
+    $(ECHO) -e "$(OK)" ; \
+    else $(ECHO) -e "$(KO)" ; \
     fi ;
 

sources/test_regression/09092005c/system.cpp

@@ -32 +32 @@
     void f() {
         int t = (int) (sc_time_stamp().to_double());
+#ifdef SYSTEMCASS_SPECIFIC
+        t = t * 1000;
+#endif
         o.write(t);
     }
@@ -38 +41 @@
     generator(sc_module_name) : clk("clk"), o("o") {
         SC_METHOD(f);
-        sensitive << clk.neg();
+        sensitive << clk.pos();
         dont_initialize();
     }
@@ -60 +63 @@
         g("generator"), 
         obs1("observer1"),
-        obs2("observer2"){
+        obs2("observer2") {
         g.clk(clk);
         obs1.clk(clk);
@@ -74 +77 @@
 
 int sc_main (int argc, char ** argv) {
-    sc_clock       clk("top_clk");
+    sc_clock clk("top_clk", sc_time(1, sc_core::SC_NS));
     sc_signal<int> out("top_out");
 
@@ -80 +83 @@
 
     t.clk(clk);
-    t.o  (out);
+    t.o(out);
 
     // QM : pourquoi est-ce tout commenté ??