Index: sources/test_regression/28102005/Makefile
===================================================================
--- sources/test_regression/28102005/Makefile	(revision 35)
+++ sources/test_regression/28102005/Makefile	(revision 55)
@@ -1,54 +1,14 @@
+
 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)
+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}
-
-%.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
-	
Index: sources/test_regression/28102005/system.cpp
===================================================================
--- sources/test_regression/28102005/system.cpp	(revision 35)
+++ sources/test_regression/28102005/system.cpp	(revision 55)
@@ -1,85 +1,82 @@
-#include <systemc.h>
+
 #include <iostream>
 #include <cstring>
 
-#define ASSERT(x) \
-  { errnum++; \
-    if (!(x)) \
-    { \
-    cerr << "ASSERT : " #x "\n"; \
-    exit (errnum); \
-    } \
-  }
-
-#ifdef DEBUG
-#define CERR(x) \
-  { cerr << "" #x " = " << x << "\n"; }
-#else
-#define CERR(x)
-#endif
+#include "systemc.h"
+#include "test.h"
 
 
 using namespace std;
 
-static int errnum = 0;
 
-void
-check_time (int i)
-{
-  const sc_time &t = sc_time_stamp ();
-  CERR(i);
-  CERR(t.to_double());
+void check_time(int i) {
+    const sc_time & t = sc_time_stamp();
+    cout << i << endl;
+
 #ifdef SYSTEMCASS_SPECIFIC
-  ASSERT((int) (t.to_double ()) == i);
+    ASSERT((int) (t.to_double()) == i);
 #else
-  ASSERT((int) (t.to_double ()) == i * 1000);
+    ASSERT((int) (t.to_double()) == i * 1000);
 #endif
-  CERR(t.to_seconds ());
-	double seconds = t.to_seconds()*1000000000;
-  CERR(seconds);
-  ASSERT(((int)seconds) == i);
-  char s[256];
-  const char *unit;
+
+    cout << t.to_seconds() << endl;
+    double seconds = t.to_seconds() * 1000000000;
+    cout << seconds << endl;
+    ASSERT(((int) seconds) == i);
+    char s[256];
+    const char * unit;
+
 #ifdef SYSTEMCASS_SPECIFIC
-  unit = "NS";
+    unit = "NS";
 #else
-  if (i == 0)
-    unit = "s";
-  else if (i < 1000)
-    unit = "ns";
-  else
-    unit = "ns";
+    if (i == 0) {
+        unit = "s";
+    }
+    else {
+        unit = "ns";
+    }
 #endif
-  sprintf (s, "%d %s", i,unit);
-  CERR(s);
-  CERR(t.to_string());
-  ASSERT(strcmp (t.to_string ().c_str(), s)== 0); 
+
+    sprintf(s, "%d %s", i, unit);
+
+    ASSERT(strcmp(t.to_string().c_str(), s) == 0); 
 }
 
-int
-sc_main (int argc, char ** argv)
-{
-  sc_clock clk ("clock");
 
-  check_time (0);
-  sc_start (0);
+int sc_main (int argc, char ** argv) {
+    sc_clock clk("clock");
 
-  check_time (0);
-  sc_start (1);
-  check_time (1);
+    check_time(0);
+    sc_start(sc_time(0, sc_core::SC_NS));
 
-  sc_start (15);
-  check_time (16);
+    check_time(0);
+    sc_start(sc_time(1, sc_core::SC_NS));
+    check_time(1);
 
-  sc_start (7);
-  check_time (23);
+    sc_start(sc_time(15, sc_core::SC_NS));
+    check_time(16);
 
-  sc_start (100);
-  check_time (123);
+    sc_start(sc_time(7, sc_core::SC_NS));
+    check_time(23);
 
-  sc_start (1000);
-  check_time (1123);
-  cerr << "Test OK.\n";
-  return 0;
+    sc_start(sc_time(100, sc_core::SC_NS));
+    check_time(123);
+
+    sc_start(sc_time(1000, sc_core::SC_NS));
+    check_time(1123);
+
+    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
+*/
+