Merge branch 'develop' into test-travis-fix

src/pg/Makefile

@@ -25,7 +25,7 @@ $(DATA): $(SOURCES_DATA)
 	$(SED) $(REPLACEMENTS) $(SOURCES_DATA_DIR)/*.sql > $@
 
 TEST_DIR = test
-REGRESS = $(notdir $(basename $(wildcard $(TEST_DIR)/sql/*test.sql)))
+REGRESS = $(sort $(notdir $(basename $(wildcard $(TEST_DIR)/sql/*test.sql))))
 REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)'
 
 PG_CONFIG = pg_config

src/pg/test/expected/01_install_test.out

@@ -1,6 +1,6 @@
 -- Install dependencies
 CREATE EXTENSION plpythonu;
-CREATE EXTENSION postgis VERSION '2.2.2';
+CREATE EXTENSION postgis;
 -- Create role publicuser if it does not exist
 DO
 $$

src/pg/test/sql/01_install_test.sql

@@ -1,6 +1,6 @@
 -- Install dependencies
 CREATE EXTENSION plpythonu;
-CREATE EXTENSION postgis VERSION '2.2.2';
+CREATE EXTENSION postgis;
 
 -- Create role publicuser if it does not exist
 DO