diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-19 15:55:43 +0000 |
|---|---|---|
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2014-03-19 15:55:43 +0000 |
| commit | 5250372ab6e1eadfa6cfd08f4c7e900e46ee4fd1 (patch) | |
| tree | 5274cb040637c6b0eb728f2b11096d9bb8ad0ba5 /test | |
| parent | 9d686e710775cb1a3ff6530476bfe7eeebc8c3ff (diff) | |
| download | gflags-5250372ab6e1eadfa6cfd08f4c7e900e46ee4fd1.tar.gz gflags-5250372ab6e1eadfa6cfd08f4c7e900e46ee4fd1.tar.bz2 gflags-5250372ab6e1eadfa6cfd08f4c7e900e46ee4fd1.zip | |
Fix conditional compilation of tests using glob expressions.
Diffstat (limited to 'test')
| -rw-r--r-- | test/gflags_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |