Pass in test_string arg to allow running one test out of suite

(manifest_testsuite_run_suite): Add test_string arg and use it to
check for test name or test literal match.

(manifest_manifests_run): Add test_string arg for above.

(main): Add -t  / --test arg for setting a test to run.

Author: dajobe

utils/manifest.c

@@ -1240,7 +1240,8 @@ manifest_test_run(manifest_test* t, const char* path)
 
 
 manifest_test_result*
-manifest_testsuite_run_suite(manifest_testsuite* ts, unsigned int indent,
+manifest_testsuite_run_suite(manifest_testsuite* ts,
+                             const char* test_string, unsigned int indent,
                              int dryrun, int verbose)
 {
   char* name = ts->name;
@@ -1263,6 +1264,17 @@ manifest_testsuite_run_suite(manifest_testsuite* ts, unsigned int indent,
 
   column = indent;
   for(i = 0; (t = (manifest_test*)raptor_sequence_get_at(ts->tests, i)); i++) {
+    if(test_string) {
+      int found = 0;
+      const char* s = RASQAL_GOOD_CAST(const char*, rasqal_literal_as_string(t->test_node));
+
+      found = (t->name && !strcmp(t->name, test_string)) ||
+              (s && !strcmp(s, test_string));
+
+      if(!found)
+        continue;
+    }
+
     if(t->flags & (FLAG_IS_UPDATE | FLAG_IS_PROTOCOL)) {
       RASQAL_DEBUG2("Ignoring test %s type UPDATE / PROTOCOL - not supported\n",
                     rasqal_literal_as_string(t->test_node));
@@ -1338,7 +1350,10 @@ manifest_testsuite_run_suite(manifest_testsuite* ts, unsigned int indent,
  * @world: world
  * @manifest_uris: sequence of #raptor_uri manifest URIs
  * @base_uri: base URI for manifest
+ * @test_string: string for running just one test (by name or URI)
  * @indent: indent size
+ * @dryrun: dryrun
+ * @verbose: verbose
  *
  * Run the given manifest testsuites returning a test result
  *
@@ -1348,6 +1363,7 @@ manifest_test_result*
 manifest_manifests_run(manifest_world* mw,
                        raptor_sequence* manifest_uris,
                        raptor_uri* base_uri,
+                       const char* test_string,
                        unsigned int indent,
                        int dryrun, int verbose)
 {
@@ -1377,7 +1393,8 @@ manifest_manifests_run(manifest_world* mw,
       break;
     }
 
-    result = manifest_testsuite_run_suite(ts, indent, dryrun, verbose);
+    result = manifest_testsuite_run_suite(ts, test_string,
+                                          indent, dryrun, verbose);
 
     if(result) {
       manifest_testsuite_result_format(stdout, result, ts->name,

utils/manifest.h

@@ -158,9 +158,9 @@ void manifest_free_world(manifest_world* mw);
 /* test */
 const char* manifest_test_get_query_language(manifest_test* t);
 
-manifest_test_result* manifest_manifests_run(manifest_world* mw, raptor_sequence* manifest_uris, raptor_uri* base_uri, unsigned int indent, int dryrun, int verbose);
+manifest_test_result* manifest_manifests_run(manifest_world* mw, raptor_sequence* manifest_uris, raptor_uri* base_uri, const char* test_string, unsigned int indent, int dryrun, int verbose);
 
-manifest_test_result* manifest_testsuite_run_suite(manifest_testsuite* ts, unsigned int indent, int dryrun, int verbose);
+manifest_test_result* manifest_testsuite_run_suite(manifest_testsuite* ts, const char* test_string, unsigned int indent, int dryrun, int verbose);
 
 /* test results */
 void manifest_free_test_result(manifest_test_result* result);

utils/testrunner.c

@@ -82,7 +82,7 @@ static char *program = NULL;
 #endif
 
 
-#define GETOPT_STRING "hnqv"
+#define GETOPT_STRING "hnqt:v"
 
 #ifdef HAVE_GETOPT_LONG
 
@@ -92,6 +92,7 @@ static struct option long_options[] =
   {"help", 0, 0, 'h'},
   {"dryrun", 0, 0, 'n'},
   {"quiet", 0, 0, 'q'},
+  {"test", 1, 0, 't'},
   {"version", 0, 0, 'v'},
   {NULL, 0, 0, 0}
 };
@@ -145,7 +146,7 @@ static void
 print_help(rasqal_world* world, raptor_world* raptor_world_ptr)
 {
   printf(title_format_string, rasqal_version_string);
-  puts("Run an RDF test suite.");
+  puts("Run an RDF query test suite.");
   printf("Usage: %s [OPTIONS] <manifest URI> [base URI]\n", program);
 
   fputs(rasqal_copyright_string, stdout);
@@ -158,6 +159,7 @@ print_help(rasqal_world* world, raptor_world* raptor_world_ptr)
   puts(HELP_TEXT("h", "help            ", "Print this help, then exit"));
   puts(HELP_TEXT("n", "dryrun          ", "Prepare but do not run the query"));
   puts(HELP_TEXT("q", "quiet           ", "No extra information messages"));
+  puts(HELP_TEXT("t TEST", "test TEST  ", "Run just one TEST"));
   puts(HELP_TEXT("v", "version         ", "Print the Rasqal version"));
   puts("\nReport bugs to http://bugs.librdf.org/");
 }
@@ -181,6 +183,7 @@ main(int argc, char *argv[])
   manifest_world* mw;
   raptor_sequence* seq;
   manifest_test_result* result;
+  char* test_string = NULL;
 
   program = argv[0];
   if((p = strrchr(program, '/')))
@@ -227,6 +230,11 @@ main(int argc, char *argv[])
         dryrun = 1;
         break;
 
+      case 't':
+        if(optarg)
+          test_string = optarg;
+        break;
+
       case 'q':
         quiet = 1;
         break;
@@ -300,6 +308,7 @@ main(int argc, char *argv[])
   raptor_sequence_push(seq, raptor_uri_copy(uri));
 
   result = manifest_manifests_run(mw, seq, base_uri,
+                                  test_string,
                                   /* indent */ 0,
                                   dryrun, !quiet);
   raptor_free_sequence(seq);