From: Andreas Schuh Date: Wed, 19 Mar 2014 15:55:43 +0000 (+0000) Subject: Fix conditional compilation of tests using glob expressions. X-Git-Tag: accepted/tizen/5.0/unified/20181102.024438~134^2~11^2~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5250372ab6e1eadfa6cfd08f4c7e900e46ee4fd1;p=platform%2Fupstream%2Fgflags.git Fix conditional compilation of tests using glob expressions. --- diff --git a/test/gflags_unittest.cc b/test/gflags_unittest.cc index 8277544..7a44f64 100644 --- a/test/gflags_unittest.cc +++ b/test/gflags_unittest.cc @@ -408,7 +408,7 @@ TEST(FlagFileTest, FilenamesOurfileFirst) { -1.0); } -#if HAVE_FNMATCH_H // otherwise glob isn't supported +#if defined(HAVE_FNMATCH_H) || (defined(_MSC_VER) && defined(HAVE_SHLWAPI_H)) // otherwise glob isn't supported TEST(FlagFileTest, FilenamesOurfileGlob) { FLAGS_test_string = "initial"; FLAGS_test_bool = false; @@ -460,7 +460,7 @@ TEST(FlagFileTest, FilenamesOurfileInBigList) { 1, -1.0); } -#endif // ifdef HAVE_FNMATCH_H +#endif // defined(HAVE_FNMATCH_H) || (defined(_MSC_VER) && defined(HAVE_SHLWAPI_H)) // Tests that a failed flag-from-string read keeps flags at default values TEST(FlagFileTest, FailReadFlagsFromString) {