Fixed space separated lists of test specs

- they form an AND expression. They were forming an OR expression due to changes made to fix -f - so that had to be fixed differently

include/internal/catch_commandline.hpp

@@ -49,7 +49,7 @@ namespace Catch {
         while( std::getline( f, line ) ) {
             line = trim(line);
             if( !line.empty() && !startsWith( line, "#" ) )
-                addTestOrTags( config, "\"" + line + "\"" );
+                addTestOrTags( config, "\"" + line + "\"," );
         }
     }
 

include/internal/catch_test_spec_parser.hpp

@@ -36,10 +36,10 @@ namespace Catch {
                 visitChar( m_arg[m_pos] );
             if( m_mode == Name )
                 addPattern<TestSpec::NamePattern>();
-            addFilter();
             return *this;
         }
         TestSpec testSpec() {
+            addFilter();
             return m_testSpec;
         }
     private:

projects/SelfTest/CmdLineTests.cpp

@@ -148,6 +148,13 @@ TEST_CASE( "Parse test names and tags", "" ) {
         CHECK( spec.matches( tcB ) == false );
         CHECK( spec.matches( tcC ) == true );
     }
+    SECTION( "Two tags, spare separated" ) {
+        TestSpec spec = parseTestSpec( "[two] [x]" );
+        CHECK( spec.hasFilters() == true );
+        CHECK( spec.matches( tcA ) == false );
+        CHECK( spec.matches( tcB ) == false );
+        CHECK( spec.matches( tcC ) == true );
+    }
     SECTION( "Wildcarded name and tag" ) {
         TestSpec spec = parseTestSpec( "*name*[x]" );
         CHECK( spec.hasFilters() == true );