Fix priority

CMakeLists.txt

@@ -42,8 +42,8 @@ if(USE_WMAIN)
 endif()
 
 if (BUILD_TESTING AND CATCH_BUILD_TESTING AND NOT_SUBPROJECT)
-    find_package(PythonInterp)
-    if (NOT PYTHONINTERP_FOUND)
+    find_package(Python COMPONENTS Interpreter)
+    if (NOT Python_Interpreter_FOUND)
         message(FATAL_ERROR "Python not found, but required for tests")
     endif()
     add_subdirectory(projects)

projects/CMakeLists.txt

@@ -402,7 +402,7 @@ add_test(NAME FilteredSection-2 COMMAND $<TARGET_FILE:SelfTest> \#1394\ nested -
 set_tests_properties(FilteredSection-2 PROPERTIES FAIL_REGULAR_EXPRESSION "No tests ran")
 
 # AppVeyor has a Python 2.7 in path, but doesn't have .py files as autorunnable
-add_test(NAME ApprovalTests COMMAND ${PYTHON_EXECUTABLE} ${CATCH_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
+add_test(NAME ApprovalTests COMMAND ${Python_EXECUTABLE} ${CATCH_DIR}/scripts/approvalTests.py $<TARGET_FILE:SelfTest>)
 set_tests_properties(ApprovalTests PROPERTIES FAIL_REGULAR_EXPRESSION "Results differed")
 
 add_test(NAME RegressionCheck-1670 COMMAND $<TARGET_FILE:SelfTest> "#1670 regression check" -c A -r compact)

scripts/approvalTests.py

@@ -92,9 +92,10 @@ def diffFiles(fileA, fileB):
 
 
 def normalizeFilepath(line):
-    if catchPathSymbolic in line:
+    if catchPathSymbolic in line or catchPathSymbolic.lower() in line:
         # make paths relative to Catch root
         line = line.replace(catchPathSymbolic + os.sep, '')
+        line = line.replace(catchPathSymbolic.lower() + os.sep, '')
 
     m = langFilenameParser.match(line)
     if m: