Browse Source

ensure windows specific tests (aspnet) don't run on our linux machine

Patrick Falls 12 years ago
parent
commit
84ab5436bd
3 changed files with 6 additions and 0 deletions
  1. 1 0
      aspnet/benchmark_config
  2. 4 0
      benchmarker.py
  3. 1 0
      framework_test.py

+ 1 - 0
aspnet/benchmark_config

@@ -1,5 +1,6 @@
 {
 {
   "framework": "aspnet",
   "framework": "aspnet",
+  "os": "nt",
   "tests": [{
   "tests": [{
     "default": {
     "default": {
       "setup_file": "setup_iis",
       "setup_file": "setup_iis",

+ 4 - 0
benchmarker.py

@@ -285,6 +285,10 @@ class Benchmarker:
   ############################################################
   ############################################################
   def __run_tests(self, tests):
   def __run_tests(self, tests):
     for test in tests:
     for test in tests:
+      if test.os == 'nt' and os.name != 'nt':
+        # this is a windows only test, but we're not on windows. abort.
+        continue
+        
       # If the user specified which tests to run, then 
       # If the user specified which tests to run, then 
       # we can skip over tests that are not in that list
       # we can skip over tests that are not in that list
       if self.test != None and test.name not in self.test:
       if self.test != None and test.name not in self.test:

+ 1 - 0
framework_test.py

@@ -79,6 +79,7 @@ class FrameworkTest:
   # The sort value is the order in which we represent all the tests. (Mainly helpful for our charts to give the underlying data)
   # The sort value is the order in which we represent all the tests. (Mainly helpful for our charts to give the underlying data)
   # a consistent ordering even when we add or remove tests. Each test should give a sort value in it's benchmark_config file.
   # a consistent ordering even when we add or remove tests. Each test should give a sort value in it's benchmark_config file.
   sort = 1000
   sort = 1000
+  os = 'linux'
 
 
   ##########################################################################################
   ##########################################################################################
   # Public Methods
   # Public Methods