Regenerate incorrect test images and reenable atlas tests for travis

qgis · Nov 24, 2014 · 2ec4c2abd3f3ce093c9ebd9f302ad339babeb950 · 2ec4c2a
1 parent b106f82
commit 2ec4c2abd3f3ce093c9ebd9f302ad339babeb950
diff --git a/.travis.yml b/.travis.yml
@@ -15,4 +15,4 @@ install:
   - cd build
   - cmake -DWITH_MAPSERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF -DSUPPRESS_QT_WARNINGS=ON ..
 
-script: xvfb-run ctest -V -E 'PyQgsPalLabelingCanvas|PyQgsPalLabelingServer|qgis_atlascompositiontest|PyQgsAtlasComposition|qgis_wcsprovidertest' -S ../qgis-test-travis.ctest --output-on-failure
+script: xvfb-run ctest -V -E 'PyQgsPalLabelingCanvas|PyQgsPalLabelingServer|qgis_wcsprovidertest' -S ../qgis-test-travis.ctest --output-on-failure
diff --git a/tests/testdata/control_images/expected_atlas_two_maps1/anomaly-precise.png b/tests/testdata/control_images/expected_atlas_two_maps1/anomaly-precise.png
diff --git a/...ta/control_images/expected_atlas_two_maps1/default/expected_atlas_two_maps1.png b/...ta/control_images/expected_atlas_two_maps1/default/expected_atlas_two_maps1.png
diff --git a/...s/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png b/...s/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png
diff --git a/...ta/control_images/expected_atlas_two_maps1/precise/expected_atlas_two_maps1.png b/...ta/control_images/expected_atlas_two_maps1/precise/expected_atlas_two_maps1.png
diff --git a/tests/testdata/control_images/expected_atlas_two_maps2/anomaly-precise.png b/tests/testdata/control_images/expected_atlas_two_maps2/anomaly-precise.png
diff --git a/...ta/control_images/expected_atlas_two_maps2/default/expected_atlas_two_maps2.png b/...ta/control_images/expected_atlas_two_maps2/default/expected_atlas_two_maps2.png
diff --git a/...s/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png b/...s/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png
diff --git a/...ta/control_images/expected_atlas_two_maps2/precise/expected_atlas_two_maps2.png b/...ta/control_images/expected_atlas_two_maps2/precise/expected_atlas_two_maps2.png