aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2018-04-26 11:01:56 +0200
committerGerald Combs <gerald@wireshark.org>2018-04-26 15:09:12 +0000
commit1a26b56c2667144b6299d4b29b5c39645bb5bd03 (patch)
tree9e1c6dc9cb92b38c28044acf4a35693e9988f911
parent962b2ba242ce9de6b7f73af13bd3a9a4e8d1161a (diff)
Ensure test directories are included with git archive
"make dist" will currently fail with "git archive" archives because dftestfiles and dftestlib is missing. To encourage distributors to run tests, ensure that these files (1.64MiB uncompressed, 688KiB gzip-compressed) are bundled. Change-Id: I1fc2bd6df45db40e64e7691235f716bbf3562f87 Reviewed-on: https://code.wireshark.org/review/27158 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r--.gitattributes1
-rw-r--r--tools/.gitattributes2
2 files changed, 0 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes
index c5f87c8a10..26b401002e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,6 @@
* text=auto
*.sh eol=lf
/test/run_and_catch_crashes eol=lf
-/test export-ignore
.bzrignore export-ignore
.gitattributes export-ignore
.gitignore export-ignore
diff --git a/tools/.gitattributes b/tools/.gitattributes
deleted file mode 100644
index 5b04d258c3..0000000000
--- a/tools/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-dftestfiles export-ignore
-dftestlib export-ignore \ No newline at end of file