Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • sources/test_regression/09092005c/Makefile

    r55 r56  
    44
    55test: all
    6         @echo -ne "| Testing $$(basename $$(pwd)): " ;
    7         @./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null
    8         @./$(EXE_SC) > $(LOG_SC) 2> /dev/null
    9         @if diff $(LOG_SC) $(LOG_SCASS) > /dev/null ; then \
    10     echo "OK" ; \
    11     else echo "KO" ; \
     6        $(SILENCE)$(ECHO) -ne "| Testing $$(basename $$(pwd)): " ;
     7        $(SILENCE)./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null
     8        $(SILENCE)./$(EXE_SC) > $(LOG_SC) 2> /dev/null
     9        $(SILENCE)if diff $(LOG_SC) $(LOG_SCASS) > /dev/null ; then \
     10    $(ECHO) -e "$(OK)" ; \
     11    else $(ECHO) -e "$(KO)" ; \
    1212    fi ;
    1313
  • sources/test_regression/09092005c/system.cpp

    r55 r56  
    3232    void f() {
    3333        int t = (int) (sc_time_stamp().to_double());
     34#ifdef SYSTEMCASS_SPECIFIC
     35        t = t * 1000;
     36#endif
    3437        o.write(t);
    3538    }
     
    3841    generator(sc_module_name) : clk("clk"), o("o") {
    3942        SC_METHOD(f);
    40         sensitive << clk.neg();
     43        sensitive << clk.pos();
    4144        dont_initialize();
    4245    }
     
    6063        g("generator"),
    6164        obs1("observer1"),
    62         obs2("observer2"){
     65        obs2("observer2") {
    6366        g.clk(clk);
    6467        obs1.clk(clk);
     
    7477
    7578int sc_main (int argc, char ** argv) {
    76     sc_clock       clk("top_clk");
     79    sc_clock clk("top_clk", sc_time(1, sc_core::SC_NS));
    7780    sc_signal<int> out("top_out");
    7881
     
    8083
    8184    t.clk(clk);
    82     t.o  (out);
     85    t.o(out);
    8386
    8487    // QM : pourquoi est-ce tout commenté ??
Note: See TracChangeset for help on using the changeset viewer.