Changeset 55 for sources/test_regression/05092005

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

Files:

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

sources/test_regression/05092005/Makefile

@@ +1 @@
+
 include ../env.mk
+include ../Makefile.common
 
-SYSTEM    = system.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)
 
-.SECONDARY:
+test: $(EXE_SCASS)
+        @echo -ne "| Testing $$(basename $$(pwd)): " ;
+        @./$< 2> /dev/null ;
+        @if [ $$? -eq 0 ] ; then echo "KO" ; else echo "OK" ; fi ;
 
-main : $(EXE) 
 
-test : $(EXE_SCASS)
-        @for i in ${EXE_SCASS} ; do \
-    echo Testing $$i... ; \
-    $$i ; \
-    if [ $$? -ne 77 ] ; then eval $${failcom} ; fi ; \
-    echo Bug detection OK ; \
-  done;
-
-%.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 ${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 system_systemcass.x.vcd system_systemc.x.vcd
-        -rm -rf generated_by_systemcass
-        

sources/test_regression/05092005/system.cpp

@@ +1 @@
+
 #include "systemc.h"
 
-#define ASSERT(x) \
-  { errnum++; \
-    if (!(x)) \
-    { \
-    cerr << "ASSERT : " #x "\n"; \
-    exit (errnum); \
-    } \
-  }
+#include "test.h"
 
 using namespace std;
 
-struct hard : sc_module
-{
-  sc_in <bool> i;
-  sc_out<bool> o;
-  SC_HAS_PROCESS(hard);
-  hard(sc_module_name)
-  {
-  }
+struct hard : sc_module {
+    sc_in<bool> i;
+    sc_out<bool> o;
+    SC_HAS_PROCESS(hard);
+    hard(sc_module_name) {}
 };
 
-int
-sc_main (int argc, char ** argv)
-{
-  sc_signal<bool> s[5];
-  hard a("a");
-  hard b("b");
-  a.i (s[0]);
-  a.o (s[1]);
-  b.i (s[5]); // Wrong array index. This BUG should be detected.
-  b.o (s[2]);
 
-  sc_initialize ();
-  sc_start (1);
+int sc_main (int argc, char ** argv) {
+    sc_clock signal_clk("my_clock", sc_time(1, sc_core::SC_NS));
+    sc_signal<bool> s[5];
+    hard a("a");
+    hard b("b");
+    a.i(s[0]);
+    a.o(s[1]);
+    b.i(s[5]); // Wrong array index. This BUG should be detected.
+    b.o(s[2]);
 
-  cerr << "Test KO.\n";
-  return 0;
+    sc_start(sc_time(0, sc_core::SC_NS));
+
+    sc_start(sc_time(1, 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
+*/
+