tests/devif: don't test networking for armv7
authorReto Achermann <reto.achermann@inf.ethz.ch>
Mon, 22 Jul 2019 16:01:15 +0000 (18:01 +0200)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Mon, 22 Jul 2019 16:01:15 +0000 (18:01 +0200)
Signed-off-by: Reto Achermann <reto.achermann@inf.ethz.ch>

usr/tests/devif/Hakefile
usr/tests/devif/queue_interface.c

index 41932cb..b6d4caf 100644 (file)
                       flounderExtraBindings = [ ("devif_test", ["rpcclient"])],
                       flounderDefs = [ "devif_test" ],
                       flounderExtraDefs = [ ("devif_test",["rpcclient"]) ],
+                      addLibraries = [ "devif" ,
+                                       "devif_backend_idc", 
+                                       "bench" ],
+                      architectures = [ "armv7" ]
+                      },                                
+
+build application { target = "devif_test", 
+                      cFiles = [ "queue_interface.c" ],
+                      flounderBindings = [ "devif_test"],
+                      flounderExtraBindings = [ ("devif_test", ["rpcclient"])],
+                      flounderDefs = [ "devif_test" ],
+                      flounderExtraDefs = [ ("devif_test",["rpcclient"]) ],
                       addLibraries = [ "devif" , "devif_backend_solarflare",
                                        "devif_backend_idc", "devif_backend_e10k", 
                                        "bench", "net", 
-                                       "devif_backend_udp"]},
+                                       "devif_backend_udp"],
+                       architectures = ["x86_64", "armv8"]
+                   },  
 
   build application { target = "devif_idc", 
                       cFiles = [ "idc_endpoint.c" ],
index c0426b2..71e2478 100644 (file)
@@ -46,7 +46,6 @@ static regionid_t regid_tx;
 static struct frame_identity id;
 static lpaddr_t phys_rx;
 static lpaddr_t phys_tx;
-static struct net_filter_state* filter;
 
 
 static volatile uint32_t num_tx = 0;
@@ -74,11 +73,14 @@ struct list_ele{
 };
 
 
+static struct devif_test_binding* binding;
+
+#ifndef __ARM_ARCH_7A__
+static struct net_filter_state* filter;
+
 static struct waitset_chanstate *chan = NULL;
 static struct waitset card_ws;
 
-static struct devif_test_binding* binding;
-
 static uint8_t udp_header[8] = {
     0x07, 0xD0, 0x07, 0xD0,
     0x00, 0x80, 0x00, 0x00,
@@ -395,7 +397,7 @@ static void test_net_rx(void)
 
     printf("SUCCESS: %s rx test ended\n", card);
 }
-
+#endif
 
 static errval_t descq_notify(struct descq* q)
 {
@@ -642,6 +644,7 @@ int main(int argc, char *argv[])
         card = "e10k";
     }
 
+    #ifndef __ARM_ARCH_7A__
     if (strcmp(argv[1], "net_tx") == 0) {
         test_net_tx();
     }
@@ -649,6 +652,7 @@ int main(int argc, char *argv[])
     if (strcmp(argv[1], "net_rx") == 0) {
         test_net_rx();
     }
+    #endif
 
     if (strcmp(argv[1], "idc") == 0) {
         test_idc_queue(true);