Author: ericwf Date: Fri Jun 17 14:57:54 2016 New Revision: 273035 URL: http://llvm.org/viewvc/llvm-project?rev=273035&view=rev Log: Fix a couple of warnings present in the filesystem tests.
Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp Modified: libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp?rev=273035&r1=273034&r2=273035&view=diff ============================================================================== --- libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp (original) +++ libcxx/trunk/test/std/experimental/filesystem/class.directory_iterator/directory_iterator.members/move_assign.pass.cpp Fri Jun 17 14:57:54 2016 @@ -24,6 +24,12 @@ #include "rapid-cxx-test.hpp" #include "filesystem_test_helper.hpp" +// The filesystem specification explicitly allows for self-move on +// the directory iterators. Turn off this warning so we can test it. +#if defined(__clang__) +#pragma clang diagnostic ignored "-Wself-move" +#endif + using namespace std::experimental::filesystem; TEST_SUITE(directory_iterator_move_assign_tests) Modified: libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp?rev=273035&r1=273034&r2=273035&view=diff ============================================================================== --- libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp (original) +++ libcxx/trunk/test/std/experimental/filesystem/class.path/path.member/path.modifiers/replace_extension.pass.cpp Fri Jun 17 14:57:54 2016 @@ -47,10 +47,10 @@ const ReplaceExtensionTestcase TestCases }; const ReplaceExtensionTestcase NoArgCases[] = { - {"", ""} - , {"foo", "foo"} - , {"foo.cpp", "foo"} - , {"foo..cpp", "foo."} + {"", "", ""} + , {"foo", "foo", ""} + , {"foo.cpp", "foo", ""} + , {"foo..cpp", "foo.", ""} }; int main() Modified: libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp?rev=273035&r1=273034&r2=273035&view=diff ============================================================================== --- libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp (original) +++ libcxx/trunk/test/std/experimental/filesystem/class.rec.dir.itr/rec.dir.itr.members/move_assign.pass.cpp Fri Jun 17 14:57:54 2016 @@ -24,6 +24,12 @@ #include "rapid-cxx-test.hpp" #include "filesystem_test_helper.hpp" +// The filesystem specification explicitly allows for self-move on +// the directory iterators. Turn off this warning so we can test it. +#if defined(__clang__) +#pragma clang diagnostic ignored "-Wself-move" +#endif + using namespace std::experimental::filesystem; TEST_SUITE(recursive_directory_iterator_move_assign_tests) _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits