projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18947: Use git-ls-files instead of git-grep to find go dirs.
[arvados.git]
/
build
/
run-tests.sh
diff --git
a/build/run-tests.sh
b/build/run-tests.sh
index 3592efbdc2bee5f6c4e25251677c581dcf65c088..54535cfef5ade71ddbf4700cd5447f040cc47d25 100755
(executable)
--- a/
build/run-tests.sh
+++ b/
build/run-tests.sh
@@
-556,6
+556,12
@@
setup_ruby_environment() {
done
"$bundle" version | tee /dev/stderr | grep -q 'version 2'
) || fatal 'install bundler'
done
"$bundle" version | tee /dev/stderr | grep -q 'version 2'
) || fatal 'install bundler'
+ if test -d /var/lib/arvados-arvbox/ ; then
+ # Inside arvbox, use bundler-installed binstubs. The
+ # system bundler and rail's own bin/bundle refuse to work.
+ # I don't know why.
+ bundle=binstubs/bundle
+ fi
fi
}
fi
}
@@
-979,7
+985,7
@@
pythonstuff=(
)
declare -a gostuff
)
declare -a gostuff
-gostuff=($(cd "$WORKSPACE" && git
grep -lw func | grep \\.go
| sed -e 's/\/[^\/]*$//' | sort -u))
+gostuff=($(cd "$WORKSPACE" && git
ls-files | grep '\.go$'
| sed -e 's/\/[^\/]*$//' | sort -u))
install_apps/workbench() {
cd "$WORKSPACE/apps/workbench" \
install_apps/workbench() {
cd "$WORKSPACE/apps/workbench" \