Changeset 56 for sources/test_regression/07052005

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

Files:

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

sources/test_regression/07052005/Makefile

@@ -4 +4 @@
 
 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" ; \
+        $(SILENCE)$(ECHO) -ne "| Testing $$(basename $$(pwd)): " ;
+        $(SILENCE)./$(EXE_SCASS) > $(LOG_SCASS) 2> /dev/null ;
+        $(SILENCE)./$(EXE_SC) > $(LOG_SC) 2> /dev/null
+        $(SILENCE)if diff $(LOG_SC) $(LOG_SCASS) > /dev/null ; then \
+    $(ECHO) -e "$(OK)" ; \
+    else $(ECHO) -e "$(KO)" ; \
     fi ;
 

sources/test_regression/07052005/system.cpp

@@ -21 +21 @@
     sc_uint<16> g;
     sc_uint<8>  h;
+    sc_uint<32> i;
+    sc_uint<17> j;
 
     b  = 0x7;
     c1 = 0x3;
     c2 = 0x1;
-    d  = 0xA0;
+    d  = 0xA;
     e  = 0x11;
     g  = 0xabcd;
 
-    // bit vector concatenation and boolean concatenation
-    a = (b, (c1 | c2), d & (b, c1), e);
+    // Concatenation
+    a = (b, (c1 | c2),  d & (b, c1), e);
+    j = (b, c1, d , e);
 
     f = b.range (0, 0);
-
     h = g.range (11, 4);
+    i = e;
 
     cout << "a = 0x" << hex << (unsigned int) a << " = " << a.to_string(SC_BIN) << "\n";
@@ -45 +48 @@
     //ASSERT(h.to_string(SC_BIN) == "0b010111100");
 
-    cout << "Test OK.\n";
+    cout << "i = 0x" << hex << (unsigned int) i << " = " << i.to_string(SC_BIN) << "\n";
+    cout << "j = 0x" << hex << (unsigned int) j << " = " << j.to_string(SC_BIN) << "\n";
 
     return 0;