aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Hahler <git@thequod.de>2019-08-26 12:21:53 +0200
committerGitHub <noreply@github.com>2019-08-26 12:21:53 +0200
commitb069a20910826d422ecbe6b6bd0f509eb2c16301 (patch)
tree0143918fc580eb3477bbe638fb2191b53038cbd2
parentb12b01a82890d4b2fb424ac9e2f8a0ad4c5d4706 (diff)
downloadrneovim-b069a20910826d422ecbe6b6bd0f509eb2c16301.tar.gz
rneovim-b069a20910826d422ecbe6b6bd0f509eb2c16301.tar.bz2
rneovim-b069a20910826d422ecbe6b6bd0f509eb2c16301.zip
runnvim.sh: lint (shellcheck) (#10851)
-rwxr-xr-xsrc/nvim/testdir/runnvim.sh34
1 files changed, 20 insertions, 14 deletions
diff --git a/src/nvim/testdir/runnvim.sh b/src/nvim/testdir/runnvim.sh
index 249b89d04e..2dcd9150be 100755
--- a/src/nvim/testdir/runnvim.sh
+++ b/src/nvim/testdir/runnvim.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
main() {(
local separator="================================================================================"
@@ -16,13 +16,15 @@ main() {(
export NVIM_TEST_ARGC=$#
local arg
local i=0
+ # shellcheck disable=SC2034 # (unused "arg", used in "eval").
for arg ; do
eval "export NVIM_TEST_ARG$i=\"\$arg\""
i=$(( i+1 ))
done
export CI_DIR="$root/ci"
- export BUILD_DIR="$(dirname "$nvim_prg")/.."
+ BUILD_DIR="$(dirname "$nvim_prg")/.."
+ export BUILD_DIR
export FAILED=0
. "$CI_DIR/common/suite.sh"
@@ -38,22 +40,26 @@ main() {(
then
fail "$test_name" F "Nvim exited with non-zero code"
fi
- echo "Stdout of :terminal runner" >> "$tlog"
- echo "$separator" >> "$tlog"
- cat "out-$tlog" >> "$tlog"
- echo "$separator" >> "$tlog"
- echo "Stderr of :terminal runner" >> "$tlog"
- echo "$separator" >> "$tlog"
- cat "err-$tlog" >> "$tlog"
- echo "$separator" >> "$tlog"
+ {
+ echo "Stdout of :terminal runner"
+ echo "$separator"
+ cat "out-$tlog"
+ echo "$separator"
+ echo "Stderr of :terminal runner"
+ echo "$separator"
+ cat "err-$tlog"
+ echo "$separator"
+ } >> "$tlog"
if test "$oldesttest" = 1 ; then
if ! diff -q test.out "$test_name.ok" > /dev/null 2>&1 ; then
if test -f test.out ; then
fail "$test_name" F "Oldest test .out file differs from .ok file"
- echo "Diff between test.out and $test_name.ok" >> "$tlog"
- echo "$separator" >> "$tlog"
- diff -a test.out "$test_name.ok" >> "$tlog"
- echo "$separator" >> "$tlog"
+ {
+ echo "Diff between test.out and $test_name.ok"
+ echo "$separator"
+ diff -a test.out "$test_name.ok"
+ echo "$separator"
+ } >> "$tlog"
else
echo "No output in test.out" >> "$tlog"
fi