Fix test failure with --enable-libaria2

M69W · Jul 13, 2014 · 04caefa · 04caefa
1 parent 4b6f404
commit 04caefa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/option_processing.cc b/src/option_processing.cc
@@ -186,11 +186,15 @@ error_code::Value option_processing(Option& op, bool standalone,
     bool noConf = false;
     std::string ucfname;
     std::stringstream cmdstream;
-    oparser->parseArg(cmdstream, uris, argc, argv);
     {
       // first evaluate --no-conf and --conf-path options.
       Option op;
-      oparser->parse(op, cmdstream);
+      if(argc == 0) {
+        oparser->parse(op, options);
+      } else {
+        oparser->parseArg(cmdstream, uris, argc, argv);
+        oparser->parse(op, cmdstream);
+      }
       noConf = op.getAsBool(PREF_NO_CONF);
       ucfname = op.get(PREF_CONF_PATH);
       if(standalone) {

diff --git a/test/Aria2ApiTest.cc b/test/Aria2ApiTest.cc
@@ -32,7 +32,7 @@ class Aria2ApiTest:public CppUnit::TestFixture {
   void setUp()
   {
     SessionConfig config;
-    KeyVals options;
+    KeyVals options = {{"no-conf", "true"}};
     session_ = sessionNew(options, config);
   }