From 5ef4ebf3c464210ab0eec84e62438d6135f44f8a Mon Sep 17 00:00:00 2001 From: Cary Clark Date: Fri, 5 Jan 2018 18:21:48 +0000 Subject: Revert "allow both slash types" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 7a600416e131b33610b1c96a367b3cb2569f458e. Reason for revert: Original change's description: > allow both slash types > > Windows allows forwards and backwards slashes > for path directory delimiters. > > R=​halcanary@google.com > > Change-Id: Ie6f1257c98ac8e2468d9297b5dc391fd17f4ae82 > Reviewed-on: https://skia-review.googlesource.com/90821 > Reviewed-by: Hal Canary > Commit-Queue: Cary Clark TBR=halcanary@google.com,bungeman@google.com,caryclark@google.com,caryclark@skia.org Change-Id: If2eefdc6dbf6b7df0280b005cea12aff4b91cf09 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/91401 Reviewed-by: Cary Clark Commit-Queue: Cary Clark --- tests/OSPathTest.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'tests/OSPathTest.cpp') diff --git a/tests/OSPathTest.cpp b/tests/OSPathTest.cpp index 74ca802304..22deff80a5 100644 --- a/tests/OSPathTest.cpp +++ b/tests/OSPathTest.cpp @@ -32,8 +32,7 @@ static void test_dir_with_file(skiatest::Reporter* reporter, SkString dir, // fullName should be the combined size of dir and file, plus one if // dir did not include the final path separator. size_t expectedSize = dir.size() + filename.size(); - if (!dir.endsWith(SkOSPath::SEPARATOR) && ('\\' != SkOSPath::SEPARATOR || - !dir.endsWith('/')) && !dir.isEmpty()) { + if (!dir.endsWith(SkOSPath::SEPARATOR) && !dir.isEmpty()) { expectedSize++; } REPORTER_ASSERT(reporter, fullName.size() == expectedSize); @@ -47,10 +46,7 @@ static void test_dir_with_file(skiatest::Reporter* reporter, SkString dir, // dirname should be the same as dir with any trailing seperators removed. // Except when the the string is just "/". SkString strippedDir = dir; - while (strippedDir.size() > 2 && - (strippedDir[strippedDir.size() - 1] == SkOSPath::SEPARATOR || - ('\\' == SkOSPath::SEPARATOR && - strippedDir[strippedDir.size() - 1] == '/'))) { + while (strippedDir.size() > 2 && strippedDir[strippedDir.size() - 1] == SkOSPath::SEPARATOR) { strippedDir.remove(strippedDir.size() - 1, 1); } if (!dirname.equals(strippedDir)) { @@ -106,13 +102,4 @@ DEF_TEST(OSPath, reporter) { // Test that nullptr can be used for the directory and filename. SkString emptyPath = SkOSPath::Join(nullptr, nullptr); REPORTER_ASSERT(reporter, emptyPath.isEmpty()); - -#ifdef SK_BUILD_FOR_WIN - test_dir_with_file(reporter, SkString("dir/"), filename); - test_dir_with_file(reporter, SkString("dir/dir"), filename); - test_dir_with_file(reporter, SkString("dir\\dir/"), filename); - test_dir_with_file(reporter, SkString("dir/dir\\"), filename); - test_dir_with_file(reporter, SkString("dir\\dir/dir"), filename); - test_dir_with_file(reporter, SkString("dir/dir\\dir"), filename); -#endif } -- cgit v1.2.3