fix project_workspace.py

Summary: project_workspace.py fix on windows Test Plan: locally, CI Reviewed By: Coneko fbshipit-source-id: 74fa4bc
jasonnam · Jun 7, 2016 · 0a757e2 · 0a757e2
1 parent 76d106d
commit 0a757e2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/test/com/facebook/buck/testutil/integration/project_workspace.py b/test/com/facebook/buck/testutil/integration/project_workspace.py
@@ -44,17 +44,20 @@ def run_buck(self, *command):
         """ Tests that the default java.util.logging setup can maintain at least 'a couple'
             of log files. """
         root_directory = os.getcwd()
-        if platform.system() == 'Windows':
+        is_windows = platform.system() == 'Windows'
+        if is_windows:
             buck_path = os.path.join(root_directory, 'bin', 'buck.bat')
+            args = ['cmd.exe', '/C', buck_path] + list(command)
         else:
             buck_path = os.path.join(root_directory, 'bin', 'buck')
+            args = [buck_path] + list(command)
         # Pass thru our environment, except disabling buckd so that we can be sure the right buck
         # is run.
         child_environment = dict(os.environ)
         child_environment["NO_BUCKD"] = "1"
 
         proc = subprocess.Popen(
-            [buck_path] + list(command),
+            args,
             cwd=self.test_data_directory,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,

diff --git a/windows_failures.txt b/windows_failures.txt
@@ -42,7 +42,5 @@
 !com.facebook.buck.util.WatchmanWatcherTest#watchmanQueryWithExcludePathsAddsMatchExpressionToQueryIfDirnameNotAvailable
 !com.facebook.buck.util.WatchmanWatcherTest#whenMultipleFilesThenMultipleEventsGenerated
 !com.facebook.buck.util.WatchmanWatcherTest#whenNameThenModifyEventIsGenerated
-!test.com.facebook.buck.cli.bootstrapper.class_loader_test.ClassLoaderTest
-!test.com.facebook.buck.log.test_log_rotation.LogRotationTest
 !src.com.facebook.buck.json.buck_test.TestBuckPosix
 !src.com.facebook.buck.json.buck_test.TestBuckWindows