comparison vamp-plugin-tester.cpp @ 8:3019cb6b538d

* Add nondeterministic and verbose options to control output
* Dump returned features in a few more situations, if verbose is set
* Dump features to stdout rather than stderr

 #include <vamp-hostsdk/PluginLoader.h>
 
 #include <iostream>
 
 #include <cstdlib>
+#include <cstring>
 
 #include "Tester.h"
 
 using namespace std;
 

          << name << ": A Vamp plugin host that tests plugins for some likely errors.\n"
         "Chris Cannam, Centre for Digital Music, Queen Mary, University of London.\n"
         "Copyright 2009 QMUL.\n"
         "Freely redistributable; published under a BSD-style license.\n\n"
         "Usage:\n"
-        "  " << name << " [<pluginbasename>:<plugin>]\n\n"
+        "  " << name << " [-n] [-v] [<pluginbasename>:<plugin>]\n\n"
         "Example:\n"
         "  " << name << " vamp-example-plugins:amplitudefollower\n\n"
         "With an argument, tests one plugin; without, tests all plugins in Vamp path.\n"
-        "If you have access to a runtime memory checker, you may find it especially\n"
+        "\nOptions:\n"
+        "  --nondeterministic, -n    Plugins may be nondeterministic: print a note\n"
+        "                            instead of an error if results differ between runs\n"
+        "  --verbose, -v             Show returned features each time a note, warning,\n"
+        "                            or error arises from feature data\n"
+        "\nIf you have access to a runtime memory checker, you may find it especially\n"
         "helpful to run this tester under it and watch for errors thus provoked.\n"
          << endl;
     exit(2);
 }
 

     while (scooter && *scooter) {
         if (*scooter == '/' || *scooter == '\\') name = ++scooter;
         else ++scooter;
     }
     if (!name || !*name) name = argv[0];
+
+    bool nondeterministic = false;
+    bool verbose = false;
+    string argument;
+    for (int i = 1; i < argc; ++i) {
+        if (!argv[i]) break;
+        if (argv[i][0] == '-') {
+            if (!strcmp(argv[i], "-v") ||
+                !strcmp(argv[i], "--verbose")) {
+                verbose = 1;
+                continue;
+            }
+            if (!strcmp(argv[i], "-n") ||
+                !strcmp(argv[i], "--nondeterministic")) {
+                nondeterministic = 1;
+                continue;
+            }
+            usage(name);
+        } else {
+            if (argument != "") usage(name);
+            else argument = argv[i];
+        }
+    }
     
-    if (argc > 2) usage(name);
-    if (argc == 2 && argv[1][0] == '-') usage(name);
-
     cerr << name << ": Running..." << endl;
 
-    if (argc == 1) {
+    Test::Options opts = Test::NoOption;
+    if (nondeterministic) opts |= Test::NonDeterministic;
+    if (verbose) opts |= Test::Verbose;
+
+    if (argument == "") {
         bool good = true;
         Vamp::HostExt::PluginLoader::PluginKeyList keys =
             Vamp::HostExt::PluginLoader::getInstance()->listPlugins();
         int notes = 0, warnings = 0, errors = 0;
         for (int i = 0; i < (int)keys.size(); ++i) {
             cout << "Testing plugin: " << keys[i] << endl;
-            Tester tester(keys[i]);
+            Tester tester(keys[i], opts);
             if (tester.test(notes, warnings, errors)) {
                 cout << name << ": All tests succeeded for this plugin" << endl;
             } else {
                 cout << name << ": Some tests failed for this plugin" << endl;
                 good = false;

         } else {
             cout << name << ": Some tests failed" << endl;
             return 1;
         }   
     } else {
-        string key = argv[1];
-        Tester tester(key);
+        string key = argument;
+        Tester tester(key, opts);
         int notes = 0, warnings = 0, errors = 0;
         if (tester.test(notes, warnings, errors)) {
             cout << name << ": All tests succeeded";
             if (warnings > 0) {
                 cout << ", with " << warnings << " warning(s)";