Browse Source

Drop support for skip key, it's deprecated by --include and --exclude

Hamilton Turner 10 years ago
parent
commit
c5a0b98cd8

+ 1 - 2
frameworks/Elixir/WeberFramework/benchmark_config

@@ -18,7 +18,6 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "weber",
       "display_name": "weber",
       "notes": "",
       "notes": "",
-      "versus": "",
-      "skip": "false"
+      "versus": ""
   }}]
   }}]
 }
 }

+ 1 - 2
frameworks/Go/revel-jet/benchmark_config

@@ -20,8 +20,7 @@
       "database_os": "Linux",
       "database_os": "Linux",
       "display_name": "revel-jet",
       "display_name": "revel-jet",
       "notes": "",
       "notes": "",
-      "versus": "go",
-      "skip": "true"
+      "versus": "go"
     }
     }
   }]
   }]
 }
 }

+ 0 - 7
toolset/benchmark/benchmarker.py

@@ -495,15 +495,8 @@ class Benchmarker:
       pass
       pass
     with open(os.path.join(self.latest_results_directory, 'logs', "{name}".format(name=test.name), 'out.txt'), 'w') as out, \
     with open(os.path.join(self.latest_results_directory, 'logs', "{name}".format(name=test.name), 'out.txt'), 'w') as out, \
          open(os.path.join(self.latest_results_directory, 'logs', "{name}".format(name=test.name), 'err.txt'), 'w') as err:
          open(os.path.join(self.latest_results_directory, 'logs', "{name}".format(name=test.name), 'err.txt'), 'w') as err:
-      if hasattr(test, 'skip'):
-        if test.skip.lower() == "true":
-          out.write("Test {name} benchmark_config specifies to skip this test. Skipping.\n".format(name=test.name))
-          return exit_with_code(0)
 
 
       if test.os.lower() != self.os.lower() or test.database_os.lower() != self.database_os.lower():
       if test.os.lower() != self.os.lower() or test.database_os.lower() != self.database_os.lower():
-        # the operating system requirements of this test for the
-        # application server or the database server don't match
-        # our current environment
         out.write("OS or Database OS specified in benchmark_config does not match the current environment. Skipping.\n")
         out.write("OS or Database OS specified in benchmark_config does not match the current environment. Skipping.\n")
         return exit_with_code(0)
         return exit_with_code(0)