Changeset 942 for branches/reconfiguration/modules/dspin_router/caba/test/simple_recovery_routing_test

Timestamp:

Feb 12, 2015, 2:59:20 PM (10 years ago)

Author:

cfuguet

Message:

reconf: improve unitary tests for dspin_router

Location:

branches/reconfiguration/modules/dspin_router/caba/test/simple_recovery_routing_test

Files:

• main.c (modified) (2 diffs)
• test.sh (modified) (1 diff)

branches/reconfiguration/modules/dspin_router/caba/test/simple_recovery_routing_test/main.c

@@ -30 +30 @@
      */
     printf("router(0, 2): configuring as NW\n");
-    assert(xcu_get_config(0, 2, 0) == BH_NONE);
-    xcu_set_config(0, 2, 0, BH_NW);    /* configure NW */
+    assert(xcu_get_register(0, 2, XICU_CFG_REG, 0) == BH_NONE);
+    xcu_set_register(0, 2, XICU_CFG_REG, 0, BH_NW);    /* configure NW */
 
     printf("router(0, 1): configuring as W\n");
-    assert(xcu_get_config(0, 1, 0) == BH_NONE);
-    xcu_set_config(0, 1, 0, BH_W);     /* configure W */
+    assert(xcu_get_register(0, 1, XICU_CFG_REG, 0) == BH_NONE);
+    xcu_set_register(0, 1, XICU_CFG_REG, 0, BH_W);     /* configure W */
 
     printf("router(0, 0): configuring as SW\n");
-    assert(xcu_get_config(0, 0, 0) == BH_NONE);
-    xcu_set_config(0, 0, 0, BH_SW);    /* configure SW */
+    assert(xcu_get_register(0, 0, XICU_CFG_REG, 0) == BH_NONE);
+    xcu_set_register(0, 0, XICU_CFG_REG, 0, BH_SW);    /* configure SW */
 
     printf("router(1, 2): configuring as N\n");
-    assert(xcu_get_config(1, 2, 0) == BH_NONE);
-    xcu_set_config(1, 2, 0, BH_N);     /* configure N */
+    assert(xcu_get_register(1, 2, XICU_CFG_REG, 0) == BH_NONE);
+    xcu_set_register(1, 2, XICU_CFG_REG, 0, BH_N);     /* configure N */
 
     printf("router(2, 2): configuring as NE\n");
-    assert(xcu_get_config(2, 2, 0) == BH_NONE);
-    xcu_set_config(2, 2, 0, BH_NE);    /* configure NE */
+    assert(xcu_get_register(2, 2, XICU_CFG_REG, 0) == BH_NONE);
+    xcu_set_register(2, 2, XICU_CFG_REG, 0, BH_NE);    /* configure NE */
 
     printf("router(2, 1): configuring as E\n");
-    assert(xcu_get_config(2, 1, 0) == BH_NONE);
-    xcu_set_config(2, 1, 0, BH_E);     /* configure E */
+    assert(xcu_get_register(2, 1, XICU_CFG_REG, 0) == BH_NONE);
+    xcu_set_register(2, 1, XICU_CFG_REG, 0, BH_E);     /* configure E */
 
     printf("router(2, 0): configuring as SE\n");
-    assert(xcu_get_config(2, 0, 0) == BH_NONE);
-    xcu_set_config(2, 0, 0, BH_SE);    /* configure SE */
+    assert(xcu_get_register(2, 0, XICU_CFG_REG, 0) == BH_NONE);
+    xcu_set_register(2, 0, XICU_CFG_REG, 0, BH_SE);    /* configure SE */
 
     printf("router(1, 0): configuring as S\n");
-    assert(xcu_get_config(1, 0, 0) == BH_NONE);
-    xcu_set_config(1, 0, 0, BH_S);     /* configure S */
+    assert(xcu_get_register(1, 0, XICU_CFG_REG, 0) == BH_NONE);
+    xcu_set_register(1, 0, XICU_CFG_REG, 0, BH_S);     /* configure S */
 
-    assert(xcu_get_config(0, 2, 0) == BH_NW);
-    assert(xcu_get_config(0, 1, 0) == BH_W);
-    assert(xcu_get_config(0, 0, 0) == BH_SW);
-    assert(xcu_get_config(1, 2, 0) == BH_N);
-    assert(xcu_get_config(2, 2, 0) == BH_NE);
-    assert(xcu_get_config(2, 1, 0) == BH_E);
-    assert(xcu_get_config(2, 0, 0) == BH_SE);
-    assert(xcu_get_config(1, 0, 0) == BH_S);
+    assert(xcu_get_register(0, 2, XICU_CFG_REG, 0) == BH_NW);
+    assert(xcu_get_register(0, 1, XICU_CFG_REG, 0) == BH_W);
+    assert(xcu_get_register(0, 0, XICU_CFG_REG, 0) == BH_SW);
+    assert(xcu_get_register(1, 2, XICU_CFG_REG, 0) == BH_N);
+    assert(xcu_get_register(2, 2, XICU_CFG_REG, 0) == BH_NE);
+    assert(xcu_get_register(2, 1, XICU_CFG_REG, 0) == BH_E);
+    assert(xcu_get_register(2, 0, XICU_CFG_REG, 0) == BH_SE);
+    assert(xcu_get_register(1, 0, XICU_CFG_REG, 0) == BH_S);
 
 #if 0
@@ -78 +78 @@
      * between them.
      */
-    assert(xcu_get_config(1, 1, 0) == BH_NONE);
+    assert(xcu_get_register(1, 1, XICU_CFG_REG, 0) == BH_NONE);
 #endif
 

branches/reconfiguration/modules/dspin_router/caba/test/simple_recovery_routing_test/test.sh

@@ -13 +13 @@
 PLATFORM=../../../../../platforms/tsar_generic_iob
 SIMULATOR=$PLATFORM/simul.x
-$SIMULATOR -DSOFT $SOFT -DISK /dev/null -FAULTY_ROUTER 0 1 1 2> /dev/null >> output/log
+$SIMULATOR -DSOFT $SOFT -DISK /dev/null -FAULTY_ROUTER 0 1 1 > output/log 2>&1
 soclib-cleanup-terms &> /dev/null
 mv term0 output/term