From 55c65a7a9a37a5d7a0d4f227a32068d17de811ba Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Thu, 22 Aug 2019 03:42:01 +0000 Subject: [PATCH] [lit] Diagnose insufficient args to internal env Without this patch, failing to provide a subcommand to lit's internal `env` results in either a python `IndexError` or an attempt to execute the final `env` argument, such as `FOO=1`, as a command. This patch diagnoses those cases with a more helpful message. Reviewed By: stella.stamenova Differential Revision: https://reviews.llvm.org/D66482 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@369620 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/lit/lit/TestRunner.py | 8 +++++-- .../shtest-env/env-args-last-is-assign.txt | 1 + .../shtest-env/env-args-last-is-u-arg.txt | 1 + .../Inputs/shtest-env/env-args-last-is-u.txt | 1 + .../tests/Inputs/shtest-env/env-args-none.txt | 1 + utils/lit/tests/shtest-env.py | 22 ++++++++++++++++++- 6 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 utils/lit/tests/Inputs/shtest-env/env-args-last-is-assign.txt create mode 100644 utils/lit/tests/Inputs/shtest-env/env-args-last-is-u-arg.txt create mode 100644 utils/lit/tests/Inputs/shtest-env/env-args-last-is-u.txt create mode 100644 utils/lit/tests/Inputs/shtest-env/env-args-none.txt diff --git a/utils/lit/lit/TestRunner.py b/utils/lit/lit/TestRunner.py index f8a00567c3c..60c6979f27c 100644 --- a/utils/lit/lit/TestRunner.py +++ b/utils/lit/lit/TestRunner.py @@ -238,7 +238,7 @@ def quote_windows_command(seq): # args are from 'export' or 'env' command. # Returns copy of args without those commands or their arguments. def updateEnv(env, args): - arg_idx = 1 + arg_idx_next = len(args) unset_next_env_var = False for arg_idx, arg in enumerate(args[1:]): # Support for the -u flag (unsetting) for env command @@ -257,9 +257,10 @@ def updateEnv(env, args): key, eq, val = arg.partition('=') # Stop if there was no equals. if eq == '': + arg_idx_next = arg_idx + 1 break env.env[key] = val - return args[arg_idx+1:] + return args[arg_idx_next:] def executeBuiltinEcho(cmd, shenv): """Interpret a redirected echo command""" @@ -880,6 +881,9 @@ def _executeShCmd(cmd, shenv, results, timeoutHelper): # env FOO=1 llc < %s | env BAR=2 llvm-mc | FileCheck %s cmd_shenv = ShellEnvironment(shenv.cwd, shenv.env) args = updateEnv(cmd_shenv, j.args) + if not args: + raise InternalShellError(j, + "Error: 'env' requires a subcommand") stdin, stdout, stderr = processRedirects(j, default_stdin, cmd_shenv, opened_files) diff --git a/utils/lit/tests/Inputs/shtest-env/env-args-last-is-assign.txt b/utils/lit/tests/Inputs/shtest-env/env-args-last-is-assign.txt new file mode 100644 index 00000000000..837210f0196 --- /dev/null +++ b/utils/lit/tests/Inputs/shtest-env/env-args-last-is-assign.txt @@ -0,0 +1 @@ +# RUN: env FOO=1 diff --git a/utils/lit/tests/Inputs/shtest-env/env-args-last-is-u-arg.txt b/utils/lit/tests/Inputs/shtest-env/env-args-last-is-u-arg.txt new file mode 100644 index 00000000000..27c81db8ed5 --- /dev/null +++ b/utils/lit/tests/Inputs/shtest-env/env-args-last-is-u-arg.txt @@ -0,0 +1 @@ +# RUN: env -u FOO diff --git a/utils/lit/tests/Inputs/shtest-env/env-args-last-is-u.txt b/utils/lit/tests/Inputs/shtest-env/env-args-last-is-u.txt new file mode 100644 index 00000000000..29134ac2e29 --- /dev/null +++ b/utils/lit/tests/Inputs/shtest-env/env-args-last-is-u.txt @@ -0,0 +1 @@ +# RUN: env -u diff --git a/utils/lit/tests/Inputs/shtest-env/env-args-none.txt b/utils/lit/tests/Inputs/shtest-env/env-args-none.txt new file mode 100644 index 00000000000..dc5cdbad09a --- /dev/null +++ b/utils/lit/tests/Inputs/shtest-env/env-args-none.txt @@ -0,0 +1 @@ +# RUN: env diff --git a/utils/lit/tests/shtest-env.py b/utils/lit/tests/shtest-env.py index ceabcada677..e89bfd6156b 100644 --- a/utils/lit/tests/shtest-env.py +++ b/utils/lit/tests/shtest-env.py @@ -1,12 +1,30 @@ # Check the env command # -# RUN: %{lit} -j 1 -a -v %{inputs}/shtest-env \ +# RUN: not %{lit} -j 1 -a -v %{inputs}/shtest-env \ # RUN: | FileCheck -match-full-lines %s # # END. # Make sure env commands are included in printed commands. +# CHECK: -- Testing: 7 tests{{.*}} + +# CHECK: FAIL: shtest-env :: env-args-last-is-assign.txt ({{[^)]*}}) +# CHECK: Error: 'env' requires a subcommand +# CHECK: error: command failed with exit status: {{.*}} + +# CHECK: FAIL: shtest-env :: env-args-last-is-u-arg.txt ({{[^)]*}}) +# CHECK: Error: 'env' requires a subcommand +# CHECK: error: command failed with exit status: {{.*}} + +# CHECK: FAIL: shtest-env :: env-args-last-is-u.txt ({{[^)]*}}) +# CHECK: Error: 'env' requires a subcommand +# CHECK: error: command failed with exit status: {{.*}} + +# CHECK: FAIL: shtest-env :: env-args-none.txt ({{[^)]*}}) +# CHECK: Error: 'env' requires a subcommand +# CHECK: error: command failed with exit status: {{.*}} + # CHECK: PASS: shtest-env :: env-u.txt ({{[^)]*}}) # CHECK: $ "{{[^"]*}}" "print_environment.py" # CHECK: $ "env" "-u" "FOO" "{{[^"]*}}" "print_environment.py" @@ -21,3 +39,5 @@ # CHECK: $ "env" "A_FOO=1" "-u" "FOO" "B_BAR=2" "-u" "BAR" "C_OOF=3" "{{[^"]*}}" "print_environment.py" # CHECK: Expected Passes : 3 +# CHECK: Unexpected Failures: 4 +# CHECK-NOT: {{.}} -- 2.40.0