Changeset 55 for sources/test_regression/16112005a

Timestamp:

May 28, 2013, 11:17:14 AM (11 years ago)

Author:

meunier

Message:

Tried to clean the test_regression directory:

• Code formatting
• Supressed warnings
• Made comprehensible outputs
• Factorized Makefiles

There's still a lot to do (many tests don't pass for either good or bad reasons)

Location:

sources/test_regression/16112005a

Files:

• . (moved) (moved from sources/test_regression/16112005)
• Makefile (modified) (2 diffs)
• system.cpp (modified) (1 diff)
• system2.cpp (deleted)
• system3.cpp (deleted)

sources/test_regression/16112005a/Makefile

@@ -1 +1 @@
 include ../env.mk
+include ../Makefile.common
 
-SYSTEM    = system.cpp system2.cpp system3.cpp
-EXE_SCASS = $(SYSTEM:.cpp=_systemcass.x)
-EXE_SC    = $(SYSTEM:.cpp=_systemc.x)
-EXE       = ${EXE_SCASS} ${EXE_SC}
-LOG       = $(SYSTEM:.cpp=.log)
-OBJECTS   = $(EXE:.x=.o)
-LINKS     = $(OBJECTS:.o=.cpp)
+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" ; \
+    fi ;
 
-.SECONDARY:
 
-main : $(EXE) 
-
-test : main
-        ./system_systemcass.x  || eval ${failcom} ; \
+#./system_systemcass.x  || eval ${failcom} ; \
         ./system2_systemcass.x ; \
    if [ $$? -ne 29 ] ; then eval ${failcom} ; fi ; \
@@ -21 +19 @@
         echo Test OK.
 
-%.gif : %.dot
-        dot -Tgif -o $*.gif $*.dot
-
-%_systemc.x : %_systemc.o $(SYSTEMC_LIB)
-        $(CXX) -o $@ $*_systemc.o $(LFLAGS_SYSTEMC) 2>&1 | $(CPPFILT)
-
-%_systemcass.x : %_systemcass.o  $(SYSTEMCASS_LIB)
-        $(CXX) -o $@ $*_systemcass.o $(LFLAGS_SYSTEMCASS) 2>&1 | $(CPPFILT)
-
--include Makefile.deps
-
-%_systemc.cpp : %.cpp 
-        ln -s $*.cpp $*_systemc.cpp
-
-%_systemcass.cpp : %.cpp 
-        ln -s $*.cpp $*_systemcass.cpp
-
-%_systemc.o : %_systemc.cpp 
-        $(CXX) $(CFLAGS_SYSTEMC) -Wno-deprecated -MM $*_systemc.cpp >> Makefile.deps
-        $(CXX) $(CFLAGS_SYSTEMC) -Wno-deprecated -c $*_systemc.cpp -o $*_systemc.o
-
-%_systemcass.o : %_systemcass.cpp
-        $(CXX) $(CFLAGS_SYSTEMCASS) -MM $*_systemcass.cpp >> Makefile.deps
-        $(CXX) $(CFLAGS_SYSTEMCASS) -c $*_systemcass.cpp -o $*_systemcass.o
-
-clean :
-        rm -f Makefile.deps
-        -rm -f *.o gmon.out *~
-        -rm -f ${LOG}
-        -rm -f signal_order.txt module_order.dot signal_graph.dot
-        -rm -f module_order.gif signal_graph.gif
-        -rm -f $(EXE) $(OBJECTS) 
-        -for i in $(LINKS) ; do unlink $$i ; done 2> /dev/null
-        -rm -f core*
-        -rm -rf generated_by_systemcass
-        -rm -rf system_systemcass.x.vcd system_systemc.x.vcd
-        

sources/test_regression/16112005a/system.cpp

@@ -1 @@
-#include <systemc.h>
+
 #include <iostream>
 #include <string>
 
-#define ASSERT(x) \
-  { errnum++; \
-    if (!(x)) \
-    { \
-    cerr << "ASSERT : " #x "\n"; \
-    exit (errnum); \
-    } \
-  }
+#include "systemc.h"
+#include "test.h"
+
 
 using namespace std;
 
-static int errnum = 0;
 
-struct internal_model : sc_module
-{
-  sc_in<int>     i;
-  sc_out<int>    o;
-  internal_model (sc_module_name n) : sc_module (n),
-    i("i"),
-    o("o")
-  {
-  }
+struct internal_model : sc_module {
+    sc_in<int> i;
+    sc_out<int> o;
+    internal_model (sc_module_name n) : sc_module (n), i("i"), o("o") {}
 };
 
-struct model : sc_module
-{
-  sc_in<int>     i1, i2, i3;
-  sc_out<int>    o1, o2, o3;
-  sc_signal<int> r1, r2;
-  internal_model internal;
 
-  model (sc_module_name n) : sc_module (n),
+struct model : sc_module {
+    sc_in<int> i1, i2, i3;
+    sc_out<int> o1, o2, o3;
+    sc_signal<int> r1, r2;
+    internal_model internal;
+
+    model(sc_module_name n) : sc_module(n),
     i1("i1"), i2("i2"), i3("i3"),
     o1("o1"), o2("o2"), o3("o3"),
     r1("r1"), r2("r2"),
     internal ("internal")
-  {
-    internal.o (o3);
-    internal.i (i3);
-//    o3 (internal.o);
-  }
+    {
+        internal.o(o3);
+        internal.i(i3);
+    }
 };
 
-int
-sc_main (int argc, char ** argv)
-{
-  model    m("m");
-  sc_clock clk ("clock");
-        sc_signal<int> s1("s1"), s2("s2"), s3("s3"), s4("s4");
 
-  m.i1 (s1);
-  m.i2 (s1); //
-  m.i3 (s1);
-  m.o1 (s4); //
-  m.o2 (s2);
-  m.o3 (s3);
+int sc_main (int argc, char ** argv) {
+    model m("m");
+    sc_clock clk("clock");
+    sc_signal<int> s1("s1"), s2("s2"), s3("s3"), s4("s4");
 
-        sc_start (0);
+    m.i1 (s1);
+    m.i2 (s1);
+    m.i3 (s1);
+    m.o1 (s4);
+    m.o2 (s2);
+    m.o3 (s3);
 
-        sc_start (1);
-        sc_start (10);
+    sc_start(sc_time(0, sc_core::SC_NS));
 
-  cerr << "Test OK.\n";
-  return 0;
+    sc_start(sc_time(1, sc_core::SC_NS));
+    sc_start(sc_time(10, sc_core::SC_NS));
+
+    cout << "OK" << endl;
+
+    return 0;
 }
 
+
+/*
+# Local Variables:
+# tab-width: 4;
+# c-basic-offset: 4;
+# c-file-offsets:((innamespace . 0)(inline-open . 0));
+# indent-tabs-mode: nil;
+# End:
+#
+# vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
+*/
+