improve how tests work, preserve the downloaded tga files

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..9e65b03
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+aclocal.m4
+autom4te.cache/
+config.guess
+config.log
+config.status
+config.sub
+configure
+depcomp
+.deps/
+install-sh
+*.la
+.libs/
+libtool
+*.lo
+ltmain.sh
+m4/
+Makefile
+Makefile.in
+missing
+*.o
+*.pc
+s2tc
+s2tc_decompress
+tests/amelia.tga
+tests/base_concrete1a.tga
+tests/bin/
+tests/*.dds
+tests/disabled.tga
+tests/floor_tile3a.tga
+tests/floor_tread01_norm.tga
+tests/floor_tread01.tga
+tests/html/
+tests/include/
+tests/lib/
+tests/lift02.tga
+tests/sunset.tga

diff --git a/tests/test.sh b/tests/test.sh
index ebb8361..4c171f8 100644 (file)
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -3,7 +3,7 @@
 set -e
 
 cd ..
-git clean -xdf
+make clean || true
 sh autogen.sh
 ./configure --prefix="`pwd`/tests" CXXFLAGS="-O3"
 make
@@ -173,13 +173,13 @@ xon()
 {
        # downloads a texture from Xonotic
        if ! [ -f "$2" ]; then
-               wget -qO- "http://git.xonotic.org/?p=xonotic/xonotic-maps.pk3dir.git;a=blob;f=$1" | convert - -geometry 512x512 "$2"
+               wget -O- "http://git.xonotic.org/?p=xonotic/xonotic-maps.pk3dir.git;a=blob_plain;f=$1" | convert "${1##*.}":- -geometry 512x512 "$2"
        fi
 }
 # floor_tread01: GPLv2+
-xon textures/exx/floor/floor_tread01.tga floor-tread01.tga
+xon textures/exx/floor/floor_tread01.tga floor_tread01.tga
 # floor_tread01_norm: GPLv2+
-xon textures/exx/floor/floor_tread01_norm.tga floor-tread01_norm.tga
+xon textures/exx/floor/floor_tread01_norm.tga floor_tread01_norm.tga
 # base_concrete1a: GPLv2+
 xon textures/trak4x/base/base_concrete1a.tga base_concrete1a.tga
 # disabled: GPLv2+
@@ -192,7 +192,7 @@ xon textures/facility114x/misc/lift02.tga lift02.tga
 xon env/distant_sunset/distant_sunset_rt.jpg sunset.tga
 # amelia: no license
 if ! [ -f "amelia.tga" ]; then
-       wget -qO- "http://www.godoon.com/gallery/media/slayers/amelia-wil-tesla-saillune/49212997-d81e-11df-8228-a8bfc396a36f.jpg" | convert JPG:- amelia.tga
+       wget -O- "http://www.godoon.com/gallery/media/slayers/amelia-wil-tesla-saillune/49212997-d81e-11df-8228-a8bfc396a36f.jpg" | convert JPG:- amelia.tga
 fi