From fbb0711ae1bb8bf1cc3738c46682b96938c50f78 Mon Sep 17 00:00:00 2001
From: Calvin Rose <calsrose@gmail.com>
Date: Sat, 24 Jun 2023 12:07:55 -0500
Subject: [PATCH] Distinguish between subprocess when testing.

---
 .github/workflows/test.yml | 2 +-
 src/core/specials.c        | 5 ++---
 test/suite-ev.janet        | 2 +-
 test/suite-os.janet        | 9 ++++++---
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1f80964f..2f5cb19c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -88,4 +88,4 @@ jobs:
       - name: Compile the project
         run: make RUN="qemu-arm -L /usr/arm-linux-gnueabi/" CC=arm-linux-gnueabi-gcc LD=arm-linux-gnueabi-gcc 
       - name: Test the project
-        run: make RUN="qemu-arm -L /usr/arm-linux-gnueabi/" test
+        run: make RUN="qemu-arm -L /usr/arm-linux-gnueabi/" SUBRUN="qemu-arm -L /usr/arm-linux-gnueabi/" test
diff --git a/src/core/specials.c b/src/core/specials.c
index 03cb0e26..d4da602e 100644
--- a/src/core/specials.c
+++ b/src/core/specials.c
@@ -357,9 +357,8 @@ SlotHeadPair *dohead_destructure(JanetCompiler *c, SlotHeadPair *into, JanetFopt
 
     if (has_drop && can_destructure_lhs && rhs_is_indexed) {
         /* Code is of the form (def [a b] [1 2]), avoid the allocation of two tuples */
-        JanetView view_lhs, view_rhs;
-        view_rhs.len = 0;
-        view_lhs.len = 0;
+        JanetView view_lhs = {0};
+        JanetView view_rhs = {0};
         janet_indexed_view(lhs, &view_lhs.items, &view_lhs.len);
         janet_indexed_view(rhs, &view_rhs.items, &view_rhs.len);
         int found_amp = 0;
diff --git a/test/suite-ev.janet b/test/suite-ev.janet
index 973f8fcd..ccecdf4e 100644
--- a/test/suite-ev.janet
+++ b/test/suite-ev.janet
@@ -26,7 +26,7 @@
 (def janet (dyn :executable))
 
 # Subprocess should inherit the "RUN" parameter for fancy testing
-(def run (filter next (string/split " " (os/getenv "RUN" ""))))
+(def run (filter next (string/split " " (os/getenv "SUBRUN" ""))))
 
 (repeat 10
 
diff --git a/test/suite-os.janet b/test/suite-os.janet
index 881f24cf..e9bd465e 100644
--- a/test/suite-os.janet
+++ b/test/suite-os.janet
@@ -21,6 +21,9 @@
 (import ./helper :prefix "" :exit true)
 (start-suite)
 
+(def janet (dyn :executable))
+(def run (filter next (string/split " " (os/getenv "SUBRUN" ""))))
+
 # OS Date test
 # 719f7ba0c
 (assert (deep= {:year-day 0
@@ -118,14 +121,14 @@
 
 # os/execute with environment variables
 # issue #636 - 7e2c433ab
-(assert (= 0 (os/execute [(dyn :executable) "-e" "(+ 1 2 3)"] :pe
+(assert (= 0 (os/execute [;run janet "-e" "(+ 1 2 3)"] :pe
                          (merge (os/environ) {"HELLO" "WORLD"})))
         "os/execute with env")
 
 # os/execute regressions
 # 427f7c362
 (for i 0 10
-  (assert (= i (os/execute [(dyn :executable) "-e"
+  (assert (= i (os/execute [;run janet "-e"
                             (string/format "(os/exit %d)" i)] :p))
           (string "os/execute " i)))
 
@@ -138,7 +141,7 @@
                                "/dev/null"))
                    (os/open path :w))
                  (with [dn (devnull)]
-                   (os/execute [(dyn :executable)
+                   (os/execute [;run janet
                                 "-e"
                                 "(print :foo) (eprint :bar)"]
                                :px