Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2015-01-09 09:30:52 +11:00
parent 3127301976 166a3e21fa
commit 5ed8d4544f
24 changed files with 150 additions and 179 deletions
--- a/test/headless.cpp
+++ b/test/headless.cpp
@@ -222,7 +222,7 @@ INSTANTIATE_TEST_CASE_P(Headless, HeadlessTest, ::testing::ValuesIn([] {

    for (dirent *dp = nullptr; (dp = readdir(dir)) != nullptr;) {
        const std::string name = dp->d_name;
-        if (name != "." && name != ".." && name != "index.html") {
+        if (name != "index.html" && !(name.size() >= 1 && name[0] == '.')) {
            names.push_back(name);
        }
    }