REVERT ME: Attempt to debug Python failures on remote Windows.

lf-lang · Jan 16, 2022 · c90aa7a · c90aa7a
1 parent d0a6693
commit c90aa7a
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 43 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,46 +16,46 @@ env:
   vcpkgGitRef: 0bf3923f9fab4001c00f0f429682a0853b5749e0
 
 jobs:
-  # Run the unit tests.
-  unit-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
+  # # Run the unit tests.
+  # unit-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/unit-tests.yml@master
 
-  # Run tests for the standalone compiler.
-  cli-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
-
-  # Run the C benchmark tests. 
-  c-benchmark-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/benchmark-tests.yml@master
-    with:
-      target: 'C'
-
-  # Run the C integration tests.
-  c-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+  # # Run tests for the standalone compiler.
+  # cli-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/cli-tests.yml@master
+
+  # # Run the C benchmark tests. 
+  # c-benchmark-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/benchmark-tests.yml@master
+  #   with:
+  #     target: 'C'
+
+  # # Run the C integration tests.
+  # c-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
 
-  # Run the CCpp integration tests.
-  ccpp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
-    with:
-      use-cpp: true
+  # # Run the CCpp integration tests.
+  # ccpp-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/c-tests.yml@master
+  #   with:
+  #     use-cpp: true
 
-  # Run the C++ benchmark tests.
-  cpp-benchmark-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/benchmark-tests.yml@master
+  # # Run the C++ benchmark tests.
+  # cpp-benchmark-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/benchmark-tests.yml@master
 
-  # Run the C++ integration tests.
-  cpp-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
+  # # Run the C++ integration tests.
+  # cpp-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/cpp-tests.yml@master
 
   # Run the Python integration tests.
   py-tests:
     uses: lf-lang/lingua-franca/.github/workflows/py-tests.yml@master
 
-  # Run the Rust integration tests.
-  rs-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
+  # # Run the Rust integration tests.
+  # rs-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/rs-tests.yml@master
 
-  # Run the TypeScript integration tests.
-  ts-tests:
-    uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@windows-ts
+  # # Run the TypeScript integration tests.
+  # ts-tests:
+  #   uses: lf-lang/lingua-franca/.github/workflows/ts-tests.yml@windows-ts
diff --git a/.github/workflows/py-tests.yml b/.github/workflows/py-tests.yml
@@ -17,7 +17,7 @@ jobs:
   run:
     strategy:
       matrix:
-        platform: [ubuntu-latest, macos-latest, windows-latest]
+        platform: [windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Setup Java JDK
@@ -69,7 +69,7 @@ jobs:
         if: ${{ runner.os == 'Linux' }}
       - name: Run Python tests
         run: |
-          ./gradlew test --tests org.lflang.tests.runtime.PythonTest.*
+          ./gradlew test --tests org.lflang.tests.runtime.PythonTest.runTargetSpecificTests
       - name: Report to CodeCov
         uses: codecov/codecov-action@v2.1.0
         with:

diff --git a/org.lflang/src/org/lflang/util/LFCommand.java b/org.lflang/src/org/lflang/util/LFCommand.java
@@ -36,9 +36,9 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Deque;
 import java.util.List;
 import java.util.Map;
-import java.util.Queue;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -341,15 +341,17 @@ private static List<File> findCommand(final String command) {
      * @return The {@code Process} that is started by this command, or {@code null} in case of failure.
      */
     private Process startProcess() {
-        Queue<List<String>> commands = new ArrayDeque<>();
-        commands.add(processBuilder.command());
+        Deque<List<String>> commands = new ArrayDeque<>();
+        commands.addLast(processBuilder.command());
         findCommand(processBuilder.command().get(0)).stream().map(it -> {
-                List<String> template = processBuilder.command();
-                template.set(0, it.toString());
-                return template;
-            }).forEach(commands::add);
+            List<String> template = processBuilder.command();
+            template.set(0, it.toString());
+            return template;
+        }).forEach(commands::addLast);
         while (true) {
-            processBuilder.command(commands.poll());
+            String cmd = commands.removeFirst();
+            System.err.println("DEBUG: attempting cmd=" + cmd);
+            processBuilder.command(cmd);
             try {
                 return processBuilder.start();
             } catch (IOException e) {