From 74090753021e0ca7d5a0c0b076bc14a3c350523b Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 3 Jan 2013 08:48:05 +0000 Subject: [PATCH] Approval filter condenses hop filenames as well as cpp --- approvalTests.py | 2 +- projects/SelfTest/Baselines/approvedResults.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/approvalTests.py b/approvalTests.py index 29543425..1ecebe26 100644 --- a/approvalTests.py +++ b/approvalTests.py @@ -3,7 +3,7 @@ import sys import subprocess import re -filenameParser = re.compile( r'\s*.*/(.*\.cpp)(.*)' ) +filenameParser = re.compile( r'\s*.*/(.*\..pp)(.*)' ) hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' ) catchPath = os.path.realpath(os.path.dirname(sys.argv[0])) diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt index 1537b30e..7a5b1610 100644 --- a/projects/SelfTest/Baselines/approvedResults.txt +++ b/projects/SelfTest/Baselines/approvedResults.txt @@ -2123,7 +2123,7 @@ Summary for test case 'second tag': -- Test case: 'selftest/main' ---------------------------------- -- Section: 'selftest/expected result' ------------------------- -- Section: 'selftest/expected result/failing tests' ----------- -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: +catch_self_test.hpp:106: [106] succeeded [with message: Tests failed, as expected] @@ -2209,7 +2209,7 @@ All 25 assertions passed -- Section: 'selftest/expected result' ------------------------- -- Section: 'selftest/expected result/succeeding tests' -------- -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: +catch_self_test.hpp:95: [95] succeeded [with message: Tests passed, as expected]