adding babybel to the special PCI cases.
authorReto Achermann <reto.achermann@inf.ethz.ch>
Fri, 12 Dec 2014 15:05:16 +0000 (16:05 +0100)
committerReto Achermann <reto.achermann@inf.ethz.ch>
Fri, 12 Dec 2014 15:05:16 +0000 (16:05 +0100)
tools/harness/barrelfish.py
tools/harness/tests/greenmarl.py

index 6341910..cc6fa77 100644 (file)
@@ -134,7 +134,9 @@ def default_bootmodules(build, machine):
         m.add_module("%s/sbin/corectrl" % a, ["auto"])
 
         if machine.name == "sbrinz1" or machine.name == "sbrinz2" \
-        or machine.name == "tomme1" or machine.name == "tomme2":
+        or machine.name == "tomme1" or machine.name == "tomme2" \
+        or machine.name == "babybel1" or machine.name == "babybel2" \
+        or machine.name == "babybel3" :
             # PCI allocation broken, use BIOS plan
             m.add_module("%s/sbin/pci" % a, ["auto",
                                              "skb_bridge_program=bridge_bios"])
index 654b471..cc3fb73 100644 (file)
@@ -42,9 +42,22 @@ class GreenMarl_PageRank(TestCommon):
     def process_data(self, testdir, rawiter):
         # the test passed iff the last line is the finish string
         lastline = ''
+        passed = False;
         for line in rawiter:
-            lastline = line
-        passed = lastline.startswith(self.get_finish_string())
+            if line.startswith(self.get_finish_string()) :
+                passed = True;
+                break;
+            elif line.startswith("Aborted") :
+                passed = False;
+                break;
+        return PassFailResult(passed)
+
+    def process_data(self, testdir, rawiter):
+        passed = False
+        for line in rawiter:
+            if line.startswith(self.get_finish_string()):
+               passed = True
+               break
         return PassFailResult(passed)
 
 @tests.add_test