revert: commit f6da9d4

matthiaskrgr · matthiaskrgr · commit 962018b722c6 · 2014-01-12T22:47:21.000+01:00
"testcmdlineparser: comment out unused functions fileListStdin(), ignorepaths{1-4}(), ignorefilepaths{1,2}()"
instead suppress the files.
also suppress unused variable in test/testpreprocessor.cpp
diff --git a/.travis_suppressions b/.travis_suppressions
@@ -2,6 +2,8 @@ uselessAssignmentPtrArg:build/checkstl.cpp
 assertWithSideEffect:build/checkuninitvar.cpp
 duplicateBranch:build/checkunusedvar.cpp
 duplicateBranch:lib/checkunusedvar.cpp
+unusedPrivateFunction:test/testcmdlineparser.cpp
+unreadVariable:test/testpreprocessor.cpp
 *:gui/test*
 *:test/test.cxx
 
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -925,63 +925,63 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(false, parser.ParseFromArgs(2, argv));
         ASSERT_EQUALS(0, parser.GetIgnoredPaths().size());
     }
-    /*
-        void ignorepaths1() {
-            REDIRECT;
-            const char *argv[] = {"cppcheck", "-isrc", "file.cpp"};
-            CmdLineParser parser(&settings);
-            ASSERT(parser.ParseFromArgs(3, argv));
-            ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
-            ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
-        }
 
-        void ignorepaths2() {
-            REDIRECT;
-            const char *argv[] = {"cppcheck", "-i", "src", "file.cpp"};
-            CmdLineParser parser(&settings);
-            ASSERT(parser.ParseFromArgs(4, argv));
-            ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
-            ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
-        }
+    void ignorepaths1() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "-isrc", "file.cpp"};
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(3, argv));
+        ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
+        ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
+    }
 
-        void ignorepaths3() {
-            REDIRECT;
-            const char *argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"};
-            CmdLineParser parser(&settings);
-            ASSERT(parser.ParseFromArgs(4, argv));
-            ASSERT_EQUALS(2, parser.GetIgnoredPaths().size());
-            ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
-            ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]);
-        }
+    void ignorepaths2() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "-i", "src", "file.cpp"};
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(4, argv));
+        ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
+        ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
+    }
 
-        void ignorepaths4() {
-            REDIRECT;
-            const char *argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"};
-            CmdLineParser parser(&settings);
-            ASSERT(parser.ParseFromArgs(6, argv));
-            ASSERT_EQUALS(2, parser.GetIgnoredPaths().size());
-            ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
-            ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]);
-        }
+    void ignorepaths3() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "-isrc", "-imodule", "file.cpp"};
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(4, argv));
+        ASSERT_EQUALS(2, parser.GetIgnoredPaths().size());
+        ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
+        ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]);
+    }
 
-        void ignorefilepaths1() {
-            REDIRECT;
-            const char *argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
-            CmdLineParser parser(&settings);
-            ASSERT(parser.ParseFromArgs(3, argv));
-            ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
-            ASSERT_EQUALS("foo.cpp", parser.GetIgnoredPaths()[0]);
-        }
+    void ignorepaths4() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "-i", "src", "-i", "module", "file.cpp"};
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(6, argv));
+        ASSERT_EQUALS(2, parser.GetIgnoredPaths().size());
+        ASSERT_EQUALS("src/", parser.GetIgnoredPaths()[0]);
+        ASSERT_EQUALS("module/", parser.GetIgnoredPaths()[1]);
+    }
+
+    void ignorefilepaths1() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "-ifoo.cpp", "file.cpp"};
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(3, argv));
+        ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
+        ASSERT_EQUALS("foo.cpp", parser.GetIgnoredPaths()[0]);
+    }
+
+    void ignorefilepaths2() {
+        REDIRECT;
+        const char *argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"};
+        CmdLineParser parser(&settings);
+        ASSERT(parser.ParseFromArgs(3, argv));
+        ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
+        ASSERT_EQUALS("src/foo.cpp", parser.GetIgnoredPaths()[0]);
+    }
 
-        void ignorefilepaths2() {
-            REDIRECT;
-            const char *argv[] = {"cppcheck", "-isrc/foo.cpp", "file.cpp"};
-            CmdLineParser parser(&settings);
-            ASSERT(parser.ParseFromArgs(3, argv));
-            ASSERT_EQUALS(1, parser.GetIgnoredPaths().size());
-            ASSERT_EQUALS("src/foo.cpp", parser.GetIgnoredPaths()[0]);
-        }
-    */
     void checkconfig() {
         REDIRECT;
         const char *argv[] = {"cppcheck", "--check-config", "file.cpp"};
