[Groonga-commit] groonga/groonga at e664f5e [master] test: use the latest grntest

Back to archive index
Kouhei Sutou null+****@clear*****
Thu May 9 19:17:01 JST 2019


Kouhei Sutou	2019-05-09 19:17:01 +0900 (Thu, 09 May 2019)

  Revision: e664f5e1bf12dc546ad95accf64df87f886a2591
  https://github.com/groonga/groonga/commit/e664f5e1bf12dc546ad95accf64df87f886a2591

  Message:
    test: use the latest grntest

  Modified files:
    .gitignore
    test/command/run-test.sh

  Modified: .gitignore (+4 -0)
===================================================================
--- .gitignore    2019-05-09 18:36:42 +0900 (345871b7c)
+++ .gitignore    2019-05-09 19:17:01 +0900 (89170da2c)
@@ -176,9 +176,13 @@ CMakeFiles
 /test/unit/run-test.sh.trs
 /test/unit/test-suite.log
 /test/unit/tmp
+/test/command/gqtp
 /test/command/grntest
+/test/command/groonga-client
 /test/command/groonga-command
 /test/command/groonga-command-parser
+/test/command/groonga-log
+/test/command/groonga-query-log
 /test/command/run-test.sh.log
 /test/command/run-test.sh.trs
 /test/command/test-suite.log

  Modified: test/command/run-test.sh (+47 -2)
===================================================================
--- test/command/run-test.sh    2019-05-09 18:36:42 +0900 (7c1ac67e4)
+++ test/command/run-test.sh    2019-05-09 19:17:01 +0900 (69d53e03c)
@@ -82,7 +82,8 @@ if ! test -d "$groonga_command_dir"; then
 fi
 if ! test -d "$groonga_command_dir"; then
   git clone --depth 1 \
-      https://github.com/groonga/groonga-command "$groonga_command_dir"
+      https://github.com/groonga/groonga-command.git \
+      "$groonga_command_dir"
 fi
 
 groonga_command_parser_dir="$SOURCE_DIR/groonga-command-parser"
@@ -91,10 +92,50 @@ if ! test -d "$groonga_command_parser_dir"; then
 fi
 if ! test -d "$groonga_command_parser_dir"; then
   git clone --depth 1 \
-      https://github.com/groonga/groonga-command-parser \
+      https://github.com/groonga/groonga-command-parser.git \
       "$groonga_command_parser_dir"
 fi
 
+gqtp_dir="$SOURCE_DIR/gqtp"
+if ! test -d "$gqtp_dir"; then
+  gqtp_dir="$BUILD_DIR/gqtp"
+fi
+if ! test -d "$gqtp_dir"; then
+  git clone --depth 1 \
+      https://github.com/ranguba/gqtp.git \
+      "$gqtp_dir"
+fi
+
+groonga_client_dir="$SOURCE_DIR/groonga-client"
+if ! test -d "$groonga_client_dir"; then
+  groonga_client_dir="$BUILD_DIR/groonga-client"
+fi
+if ! test -d "$groonga_client_dir"; then
+  git clone --depth 1 \
+      https://github.com/ranguba/groonga-client.git \
+      "$groonga_client_dir"
+fi
+
+groonga_log_dir="$SOURCE_DIR/groonga-log"
+if ! test -d "$groonga_log_dir"; then
+  groonga_log_dir="$BUILD_DIR/groonga-log"
+fi
+if ! test -d "$groonga_log_dir"; then
+  git clone --depth 1 \
+      https://github.com/groonga/groonga-log.git \
+      "$groonga_log_dir"
+fi
+
+groonga_query_log_dir="$SOURCE_DIR/groonga-query-log"
+if ! test -d "$groonga_query_log_dir"; then
+  groonga_query_log_dir="$BUILD_DIR/groonga-query-log"
+fi
+if ! test -d "$groonga_query_log_dir"; then
+  git clone --depth 1 \
+      https://github.com/groonga/groonga-query-log.git \
+      "$groonga_query_log_dir"
+fi
+
 have_targets="false"
 use_gdb="false"
 use_valgrind="false"
@@ -156,6 +197,10 @@ $RUBY \
   -I "$grntest_dir/lib" \
   -I "$groonga_command_dir/lib" \
   -I "$groonga_command_parser_dir/lib" \
+  -I "$gqtp_dir/lib" \
+  -I "$groonga_client_dir/lib" \
+  -I "$groonga_log_dir/lib" \
+  -I "$groonga_query_log_dir/lib" \
   "$grntest_dir/bin/grntest" \
   --groonga "$GROONGA" \
   --groonga-httpd "$GROONGA_HTTPD" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190509/fd10618d/attachment-0001.html>


More information about the Groonga-commit mailing list
Back to archive index