fix command expect script

lukewilliamboswell · lukewilliamboswell · commit efc4ee798c30 · 2024-04-22T11:09:17.000+10:00
diff --git a/ci/expect_scripts/command.exp b/ci/expect_scripts/command.exp
@@ -10,7 +10,7 @@ source ./ci/expect_scripts/shared-code.exp
 spawn $env(EXAMPLES_DIR)command
 
 
-expect -exact "BAZ=DUCK\r\nFOO=BAR\r\nSuccess\r\nSTDOUT '-rw-r--r--'\r\n\r\nSTDERR \r\nSUCCESS\n\n\r\n" {
+expect -exact "BAZ=DUCK\r\nFOO=BAR\r\nSTATUS\r\nFOO=BAR\r\nEXEC" {
     expect eof {
         check_exit_and_segfault
     }
diff --git a/examples/command.roc b/examples/command.roc
@@ -11,7 +11,7 @@ main =
     runEnv!
     runStat!
 
-    Cmd.exec! "echo" ["SUCCESS"]
+    Cmd.exec! "echo" ["EXEC"]
 
 # Run "env" with verbose option, clear all environment variables, and pass in
 # "FOO" and "BAZ".
@@ -25,33 +25,30 @@ runEnv =
             |> Task.result!
 
     when result is
-        Ok {} -> Stdout.line "Success"
+        Ok {} -> Stdout.line "STATUS"
         Err (ExitCode code) ->
             codeStr = Num.toStr code
             Stdout.line "Child exited with non-zero code: $(codeStr)"
 
         Err KilledBySignal -> Stdout.line "Child was killed by signal"
         Err (IOError err) -> Stdout.line "IOError executing: $(err)"
 
-# Run "stat" with environment variable "FOO" set to "BAR" and three arguments:
-# "--format", "'%A'", and "LICENSE". Capture stdout and stderr and print them.
+# Run "env" with verbose option, clear all environment variables, and pass in
+# only as an environment variable "FOO"
 runStat =
     output =
-        Cmd.new "stat"
+        Cmd.new "env"
+            |> Cmd.clearEnvs
             |> Cmd.env "FOO" "BAR"
-            |> Cmd.args [
-                "--format",
-                "'%A'", # print permission bits in human readable form
-                "LICENSE", # filename
-            ]
+            |> Cmd.args ["-v"]
             |> Cmd.output
             |> Task.onErr! \(output, err) ->
                 when err is
                     ExitCode code -> Task.err (StatError "Child exited with non-zero code: $(Num.toStr code), stderr: $(output.stderr |> Str.fromUtf8 |> Result.withDefault "")")
                     KilledBySignal -> Task.err (StatError "Child was killed by signal")
                     IOError ioErr -> Task.err (StatError "IOError executing: $(ioErr)")
 
-    stdoutStr = output.stdout |> Str.fromUtf8 |> Result.withDefault "Failed to decode stdout"
-    stderrStr = output.stderr |> Str.fromUtf8 |> Result.withDefault "Failed to decode stderr"
-
-    Stdout.write "STDOUT $(stdoutStr)\nSTDERR $(stderrStr)\n"
+    output.stdout 
+    |> Str.fromUtf8 
+    |> Result.withDefault "Failed to decode stdout"
+    |> Stdout.write

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ source ./ci/expect_scripts/shared-code.exp`
`10`	`10`	`spawn $env(EXAMPLES_DIR)command`
`11`	`11`
`12`	`12`
`13`		`-expect -exact "BAZ=DUCK\r\nFOO=BAR\r\nSuccess\r\nSTDOUT '-rw-r--r--'\r\n\r\nSTDERR \r\nSUCCESS\n\n\r\n" {`
	`13`	`+expect -exact "BAZ=DUCK\r\nFOO=BAR\r\nSTATUS\r\nFOO=BAR\r\nEXEC" {`
`14`	`14`	`expect eof {`
`15`	`15`	`check_exit_and_segfault`
`16`	`16`	`}`