Kouhei Sutou 2019-03-22 09:07:18 +0900 (Fri, 22 Mar 2019) Revision: 27f87b3509db6ac3ac4b83de9134326c841dcf81 https://github.com/groonga/groonga/commit/27f87b3509db6ac3ac4b83de9134326c841dcf81 Message: test command: use test library in source directory preferentially Modified files: test/command/run-test.sh Modified: test/command/run-test.sh (+14 -8) =================================================================== --- test/command/run-test.sh 2019-03-20 18:00:43 +0900 (e2c0b3f82) +++ test/command/run-test.sh 2019-03-22 09:07:18 +0900 (fc274c1bb) @@ -65,24 +65,30 @@ if ! type bundle 2>&1 > /dev/null; then $RUBY -S gem install bundler fi -grntest_dir="$BUILD_DIR/grntest" +grntest_dir="$SOURCE_DIR/grntest" if ! test -d "$grntest_dir"; then + grntest_dir="$BUILD_DIR/grntest" git clone --depth 1 git://github.com/groonga/grntest.git "$grntest_dir" (cd "$grntest_dir" && bundle install) -else - (cd "$grntest_dir"; - if [ "Gemfile" -nt "Gemfile.lock" ]; then - $RUBY -S bundle update - fi) fi +(cd "$grntest_dir"; + if [ "Gemfile" -nt "Gemfile.lock" ]; then + $RUBY -S bundle update + fi) -groonga_command_dir="$BUILD_DIR/groonga-command" +groonga_command_dir="$SOURCE_DIR/groonga-command" +if ! test -d "$groonga_command_dir"; then + groonga_command_dir="$BUILD_DIR/groonga-command" +fi if ! test -d "$groonga_command_dir"; then git clone --depth 1 \ git://github.com/groonga/groonga-command "$groonga_command_dir" fi -groonga_command_parser_dir="$BUILD_DIR/groonga-command-parser" +groonga_command_parser_dir="$SOURCE_DIR/groonga-command-parser" +if ! test -d "$groonga_command_parser_dir"; then + groonga_command_parser_dir="$BUILD_DIR/groonga-command-parser" +fi if ! test -d "$groonga_command_parser_dir"; then git clone --depth 1 \ git://github.com/groonga/groonga-command-parser \ -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190322/cd28c8f4/attachment-0001.html>
