fixed #13922 - fail platform lookup when an invalid file is encountered (danmar#7575)

Author: firewave

lib/platform.cpp

@@ -219,20 +219,22 @@ bool Platform::loadFromFile(const char exename[], const std::string &filename, b
 
     // open file..
     tinyxml2::XMLDocument doc;
-    bool success = false;
+    tinyxml2::XMLError err = tinyxml2::XML_SUCCESS;
     for (const std::string & f : filenames) {
         if (debug)
             std::cout << "try to load platform file '" << f << "' ... ";
-        if (doc.LoadFile(f.c_str()) == tinyxml2::XML_SUCCESS) {
+        err = doc.LoadFile(f.c_str());
+        if (err == tinyxml2::XML_SUCCESS) {
             if (debug)
                 std::cout << "Success" << std::endl;
-            success = true;
             break;
         }
         if (debug)
             std::cout << doc.ErrorStr() << std::endl;
+        if (err != tinyxml2::XML_ERROR_FILE_NOT_FOUND)
+            break;
     }
-    if (!success)
+    if (err != tinyxml2::XML_SUCCESS)
         return false;
 
     return loadFromXmlDocument(&doc);

test/cli/lookup_test.py

@@ -465,8 +465,6 @@ def test_platform_lookup_nofile(tmpdir):
     ]
 
 
-# make sure we bail out when we encounter an invalid file
-@pytest.mark.xfail(strict=True)  # TODO: does not bail out after it found an invalid file
 def test_platform_lookup_invalid(tmpdir):
     test_file = os.path.join(tmpdir, 'test.c')
     with open(test_file, 'wt'):