From cbe60aaada0fc7d1248c6e580aea7c28ea342ce6 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Wed, 30 Jan 2013 16:51:39 +0000
Subject: Fix make check

---
diff --git a/devbot/build.py b/devbot/build.py
index b30fdb3..c01f373 100644
--- a/devbot/build.py
+++ b/devbot/build.py
@@ -144,8 +144,7 @@ def _build_autotools(module, log):
         if module.options:
             options = module.options
         elif module.options_ev:
-            options = [_eval_option(option)
-                           for option in module.options_ev]
+            options = [_eval_option(option) for option in module.options_ev]
         else:
             options = ["--prefix", config.prefix_dir,
                        "--libdir", config.lib_dir]
diff --git a/devbot/config.py b/devbot/config.py
index 05ffcca..197492d 100644
--- a/devbot/config.py
+++ b/devbot/config.py
@@ -33,7 +33,7 @@ class Module:
         self.tag = info.get("tag", None)
         self.auto_install = info.get("auto-install", False)
         self.options = info.get("options", [])
-        self.options_ev = info.get("options_ev", []) 
+        self.options_ev = info.get("options_ev", [])
         self.extra_options = info.get("extra_options", [])
         self.extra_options_ev = info.get("extra_options_ev", [])
         self.has_checks = info.get("has_checks", False)
@@ -55,7 +55,7 @@ class Module:
         if os.path.exists(os.path.join(source_dir, "setup.py")):
             return "activity"
         elif os.path.exists(os.path.join(source_dir, "autogen.sh")) or \
-             os.path.exists(os.path.join(source_dir, "configure")):
+                os.path.exists(os.path.join(source_dir, "configure")):
             return "autotools"
         elif os.path.exists(os.path.join(source_dir, "package.json")):
             return "node"
diff --git a/devbot/environ.py b/devbot/environ.py
index 5e595ce..a9643de 100644
--- a/devbot/environ.py
+++ b/devbot/environ.py
@@ -28,7 +28,7 @@ def setup_variables():
     add_path("PKG_CONFIG_PATH",
              os.path.join(config.lib_dir, "pkgconfig"))
     add_path("GST_PLUGIN_PATH",
-             os.path.join(config.lib_dir, "gstreamer-1.0")) 
+             os.path.join(config.lib_dir, "gstreamer-1.0"))
     add_path("NODE_PATH",
              os.path.join(config.prefix_dir, "lib", "node_modules"))
     add_path("PYTHONPATH",
diff --git a/tests/sugar/shell.py b/tests/sugar/shell.py
index 255786e..2565a6d 100644
--- a/tests/sugar/shell.py
+++ b/tests/sugar/shell.py
@@ -6,6 +6,7 @@ import traceback
 import tree
 
 ACTIVITIES_WITH_OBJECT_CHOOSER = ["Read"]
+SKIP_ACTIVITIES = ["HTMLDemo", "HelloHtmlWorld"]
 
 
 def build_activities_list():
@@ -19,7 +20,8 @@ def build_activities_list():
 
     for row in [cells[i:i + 5] for i in range(0, len(cells), 5)]:
         activity_name = row[2].text
-        activities.append(activity_name)
+        if activity_name not in SKIP_ACTIVITIES:
+            activities.append(activity_name)
 
     activities.sort()
 
--
cgit v0.9.1