From 047db2299cf8249a745ab3ff192498ce3657721a Mon Sep 17 00:00:00 2001
From: Chris Angelico <rosuav@gmail.com>
Date: Fri, 6 Jun 2014 07:45:55 +1000
Subject: [PATCH] Turn the Travis CI test skipping mechanism into something
 more generic

---
 tests/run-tests | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/run-tests b/tests/run-tests
index 15c2cbbf5c..866e5a14cc 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -27,16 +27,17 @@ def run_tests(pyb, tests):
     failed_tests = []
     skipped_tests = []
 
-    running_under_travis = os.getenv('TRAVIS') == 'true'
+    skip_tests = set()
 
-    # Set of tests that we shouldn't run under Travis CI
-    skip_travis_tests = set(['basics/memoryerror.py'])
+    # Some tests shouldn't be run under Travis CI
+    if os.getenv('TRAVIS') == 'true':
+        skip_tests.add('basics/memoryerror.py')
 
     for test_file in tests:
         test_basename = os.path.basename(test_file)
         test_name = os.path.splitext(test_basename)[0]
 
-        if running_under_travis and test_file in skip_travis_tests:
+        if test_file in skip_tests:
             print("skip ", test_file)
             skipped_tests.append(test_name)
             continue