Changeset 55 for sources/test_regression/16122005

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/16122005

Files:

• Makefile (modified) (1 diff)
• results_ref.txt (moved) (moved from sources/test_regression/16122005/results_reference.txt)
• system.cpp (modified) (2 diffs)

sources/test_regression/16122005/Makefile

@@ +1 @@
+
 include ../env.mk
+RESULTS = results.txt
+ERASE = $(RESULTS)
+include ../Makefile.common
 
-SYSTEM    = system.cpp
-EXE_SCASS = $(SYSTEM:.cpp=_systemcass.x)
-EXE_SC    = $(SYSTEM:.cpp=_systemc.x)
-EXE       = ${EXE_SCASS} ${EXE_SC}
-OBJECTS   = $(EXE:.x=.o)
-LINKS     = $(OBJECTS:.o=.cpp)
+RESULTS_REF = results_ref.txt
 
-.SECONDARY:
+test : $(EXE_SCASS)
+        @echo -ne "| Testing $$(basename $$(pwd)): " ;
+        @./$(EXE_SCASS) 2> /dev/null
+        @if diff $(RESULTS) $(RESULTS_REF) > /dev/null ; then \
+    echo "OK" ; \
+    else echo "KO" ; \
+    fi ;
 
-main : $(EXE)
 
-test : main
-        ./system_systemcass.x
-        diff results.txt results_reference.txt
-        @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) -MM $*_systemc.cpp >> Makefile.deps
-        $(CXX) $(CFLAGS_SYSTEMC) -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 results.txt
-        -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/16122005/system.cpp

@@ -1 @@
-#include <systemc.h>
+
 #include <iostream>
 #include <fstream>
@@ -5 +5 @@
 #include <cstring> //strcmp
 
-#define ASSERT(x) { if (!(x)) { \
-                      cerr << "ASSERT : " #x \
-                           << " in function '" << __FUNCTION__  \
-                           << "'\n"; exit (-1); \
-                    } \
-                  }
+#include <systemc.h>
+#include "test.h"
 
 
 using namespace std;
 
-struct D : sc_module
-{
-  D (sc_module_name n)
-  {
-  }
+
+struct D : sc_module {
+    D (sc_module_name n) {}
 };
 
-struct C : sc_module
-{
-  C (sc_module_name n)
-  {
-  }
+
+struct C : sc_module {
+    C(sc_module_name n) {}
 };
 
-struct B : sc_module
-{
-  D d1;
-  D d2;
-  C c;
-  B (sc_module_name n) : d1("d1"), d2("d2"), c("c")
-  {
-  }
+
+struct B : sc_module {
+    D d1;
+    D d2;
+    C c;
+    B(sc_module_name n) : d1("d1"), d2("d2"), c("c") {}
 };
 
-struct A : sc_module
-{
-  B b;
-  C c;
-  A (sc_module_name n) : b("b"), c("c")
-  {
-  }
+
+struct A : sc_module {
+    B b;
+    C c;
+    A(sc_module_name n) : b("b"), c("c") {}
 };
 
-struct top_level1 : sc_module
-{
-  A a;
-  D d;
-  top_level1(sc_module_name insname) : sc_module (insname), a("a"), d("d")
-  {
-    ASSERT(strcmp ((const char*)insname,"top1") == 0);
-  }
+
+struct top_level1 : sc_module {
+    A a;
+    D d;
+    top_level1(sc_module_name insname) : sc_module (insname), a("a"), d("d") {
+        ASSERT(strcmp((const char *) insname, "top1") == 0);
+    }
 };
 
-struct top_level2 : sc_module
-{
-  B b1;
-  B b2;
-  C c;
-  top_level2(sc_module_name insname) : b1("b1"), b2("b2"), c("c")
-  {
-    ASSERT(strcmp ((const char*)insname,"top2") == 0);
-    ofstream o;
-    o.open ("results.txt");
-    o << (const char*)insname << endl;
-    o << insname << endl;
-    o.close ();
-  }
+
+struct top_level2 : sc_module {
+    B b1;
+    B b2;
+    C c;
+    top_level2(sc_module_name insname) : b1("b1"), b2("b2"), c("c") {
+        ASSERT(strcmp ((const char *) insname, "top2") == 0);
+        ofstream o;
+        o.open("results.txt");
+        o << (const char *) insname << endl;
+        o << insname << endl;
+        o.close();
+    }
 };
 
-int
-sc_main (int argc, char ** argv)
-{
-  if (argc < 1)
-  {
-    cerr << "Usage : " << argv[0] << "\n";
-    exit (-1);
-  }
 
-  sc_clock   clk("clock");
-  top_level1 top1("top1");
-  top_level2 top2("top2");
+int sc_main (int argc, char ** argv) {
+    if (argc < 1) {
+        cerr << "Usage : " << argv[0] << "\n";
+        exit(-1);
+    }
 
-  sc_start(0);
+    sc_clock clk("clock");
+    top_level1 top1("top1");
+    top_level2 top2("top2");
 
-  return 0;
+    sc_start(sc_time(0, sc_core::SC_NS));
+
+    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
+*/
+