From f83080c1d0ef2398bb25dc0ff0bebb264bc1ea8c Mon Sep 17 00:00:00 2001 From: Oliver Tonnhofer Date: Mon, 16 Apr 2018 18:16:24 +0200 Subject: [PATCH] test: temporary rename of generated for updated timestamps to fix make errors --- test/generate/README | 2 -- test/generated/README | 6 ++++++ test/{generate => generated}/any_any.pbf | Bin test/{generate => generated}/complete_db.osc.gz | Bin test/{generate => generated}/complete_db.pbf | Bin test/{generate => generated}/expire_tiles.osc.gz | Bin test/{generate => generated}/expire_tiles.pbf | Bin test/{generate => generated}/route_relation.osc.gz | Bin test/{generate => generated}/route_relation.pbf | Bin test/{generate => generated}/single_table.osc.gz | Bin test/{generate => generated}/single_table.pbf | Bin 11 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 test/generate/README create mode 100644 test/generated/README rename test/{generate => generated}/any_any.pbf (100%) rename test/{generate => generated}/complete_db.osc.gz (100%) rename test/{generate => generated}/complete_db.pbf (100%) rename test/{generate => generated}/expire_tiles.osc.gz (100%) rename test/{generate => generated}/expire_tiles.pbf (100%) rename test/{generate => generated}/route_relation.osc.gz (100%) rename test/{generate => generated}/route_relation.pbf (100%) rename test/{generate => generated}/single_table.osc.gz (100%) rename test/{generate => generated}/single_table.pbf (100%) diff --git a/test/generate/README b/test/generate/README deleted file mode 100644 index 6f94e77..0000000 --- a/test/generate/README +++ /dev/null @@ -1,2 +0,0 @@ -Files in this directory are generated by `make files` in ./test by calling osmosis and gzip. -The sources for these files are in ./test. diff --git a/test/generated/README b/test/generated/README new file mode 100644 index 0000000..22bd933 --- /dev/null +++ b/test/generated/README @@ -0,0 +1,6 @@ +Files in this directory are generated by `make files` in ./test by calling osmosis and gzip. +The sources for these files are in ./test. + +Generated files need to be commited in separate commit! Otherwise source and +generated file will have the same mtime when checked out from git and make will +try to regenerate the file. diff --git a/test/generate/any_any.pbf b/test/generated/any_any.pbf similarity index 100% rename from test/generate/any_any.pbf rename to test/generated/any_any.pbf diff --git a/test/generate/complete_db.osc.gz b/test/generated/complete_db.osc.gz similarity index 100% rename from test/generate/complete_db.osc.gz rename to test/generated/complete_db.osc.gz diff --git a/test/generate/complete_db.pbf b/test/generated/complete_db.pbf similarity index 100% rename from test/generate/complete_db.pbf rename to test/generated/complete_db.pbf diff --git a/test/generate/expire_tiles.osc.gz b/test/generated/expire_tiles.osc.gz similarity index 100% rename from test/generate/expire_tiles.osc.gz rename to test/generated/expire_tiles.osc.gz diff --git a/test/generate/expire_tiles.pbf b/test/generated/expire_tiles.pbf similarity index 100% rename from test/generate/expire_tiles.pbf rename to test/generated/expire_tiles.pbf diff --git a/test/generate/route_relation.osc.gz b/test/generated/route_relation.osc.gz similarity index 100% rename from test/generate/route_relation.osc.gz rename to test/generated/route_relation.osc.gz diff --git a/test/generate/route_relation.pbf b/test/generated/route_relation.pbf similarity index 100% rename from test/generate/route_relation.pbf rename to test/generated/route_relation.pbf diff --git a/test/generate/single_table.osc.gz b/test/generated/single_table.osc.gz similarity index 100% rename from test/generate/single_table.osc.gz rename to test/generated/single_table.osc.gz diff --git a/test/generate/single_table.pbf b/test/generated/single_table.pbf similarity index 100% rename from test/generate/single_table.pbf rename to test/generated/single_table.pbf