From e599857fc6e74ddc8ac07e7f98a80579bf4117f5 Mon Sep 17 00:00:00 2001 From: Andy C Date: Sun, 15 May 2022 02:01:46 -0400 Subject: [PATCH] [fix] More fixes for osh_eval filename --- benchmarks/id.sh | 2 +- test/parse-errors.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benchmarks/id.sh b/benchmarks/id.sh index adf4ad8f28..8434f30a4d 100755 --- a/benchmarks/id.sh +++ b/benchmarks/id.sh @@ -89,7 +89,7 @@ dump-shell-id() { osh) $sh --version > $out_dir/osh-version.txt ;; - osh_eval.opt.stripped) + osh_eval.stripped) # just rely on the stuff above ;; dash|mksh) diff --git a/test/parse-errors.sh b/test/parse-errors.sh index d5fa62ce90..5325643b81 100755 --- a/test/parse-errors.sh +++ b/test/parse-errors.sh @@ -78,12 +78,10 @@ _should-parse-here() { _should-parse "$(cat)"; } _runtime-parse-error() { ### Assert that a parse error happens at runtime - case $SH in - *osh_*.asan) - echo 'skipping _runtime-parse-error' - return - ;; - esac + if is-oil-native; then + echo 'skipping _runtime-parse-error' + return + fi banner "$@" echo @@ -606,8 +604,10 @@ invalid-brace-ranges() { oil-language() { set +o errexit - # disabled until we port the parser - case $SH in *osh_*.asan) return ;; esac + if is-oil-native; then + echo 'Skipping oil-language' + return + fi # Unterminated _error-case 'var x = 1 + '