[gegl] tests/buffer: Make buffer tests work during distcheck



commit cb8f0f5a5f51fc6a618bef479737d774c7e49fb9
Author: Martin Nordholts <martinn src gnome org>
Date:   Fri Jul 23 18:27:28 2010 +0200

    tests/buffer: Make buffer tests work during distcheck

 configure.ac                         |    2 ++
 tests/buffer/Makefile.am             |    8 ++++++--
 tests/buffer/buffer-tests-results.sh |    2 +-
 tests/buffer/reference/.gitignore    |    2 ++
 tests/buffer/reference/Makefile.am   |    1 +
 tests/buffer/tests/.gitignore        |    2 ++
 tests/buffer/tests/Makefile.am       |    1 +
 7 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 815eaed..1bd7f28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1027,6 +1027,8 @@ examples/Makefile
 examples/data/Makefile
 tests/Makefile
 tests/buffer/Makefile
+tests/buffer/reference/Makefile
+tests/buffer/tests/Makefile
 tests/compositions/Makefile
 tests/compositions/data/Makefile
 tests/simple/Makefile
diff --git a/tests/buffer/Makefile.am b/tests/buffer/Makefile.am
index a64c155..959ea25 100644
--- a/tests/buffer/Makefile.am
+++ b/tests/buffer/Makefile.am
@@ -1,8 +1,12 @@
+SUBDIRS = \
+	reference \
+	tests
+
 # The test program returns 'success' if all buffer tests passed
 TESTS = buffer-tests-results.sh
 buffer-tests-results.sh: buffer-tests-report
 
-EXTRA_DIST = $(wildcard reference/*.buf) $(wildcard tests/*.c) buffer-tests-results.sh
+EXTRA_DIST = buffer-tests-results.sh
 
 # Always build buffer-test to catch compilation problems early
 BUILT_SOURCES = buffer-tests.inc
@@ -49,7 +53,7 @@ buffer-tests.inc: $(buffer_test_SOURCES) Makefile.am $(top_srcdir)/tests/buffer/
 buffer-tests-report: buffer-test$(EXEEXT) $(top_srcdir)/tests/buffer/reference/*.buf
 	mkdir -p output > /dev/null 2>&1
 	./buffer-test$(EXEEXT)
-	diff -s -r -C 50 $(top_srcdir)/tests/buffer/reference/ output/ > buffer-tests-report; true
+	for f in $(top_srcdir)/tests/buffer/reference/*.buf; do diff --report-identical-files --context=50 $$f output/`basename $$f`; done > buffer-tests-report; true
 
 
 # Don't forget to clean
diff --git a/tests/buffer/buffer-tests-results.sh b/tests/buffer/buffer-tests-results.sh
index d731035..02e1e5f 100755
--- a/tests/buffer/buffer-tests-results.sh
+++ b/tests/buffer/buffer-tests-results.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-total_tests=`ls -1 reference | wc -l`
+total_tests=`ls -1 reference/*.buf | wc -l`
 successful_tests=`cat buffer-tests-report | grep identical | wc -l`
 
 echo $successful_tests of $total_tests tests succesful.
diff --git a/tests/buffer/reference/.gitignore b/tests/buffer/reference/.gitignore
new file mode 100644
index 0000000..b336cc7
--- /dev/null
+++ b/tests/buffer/reference/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/tests/buffer/reference/Makefile.am b/tests/buffer/reference/Makefile.am
new file mode 100644
index 0000000..daa6096
--- /dev/null
+++ b/tests/buffer/reference/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.buf)
diff --git a/tests/buffer/tests/.gitignore b/tests/buffer/tests/.gitignore
new file mode 100644
index 0000000..b336cc7
--- /dev/null
+++ b/tests/buffer/tests/.gitignore
@@ -0,0 +1,2 @@
+/Makefile
+/Makefile.in
diff --git a/tests/buffer/tests/Makefile.am b/tests/buffer/tests/Makefile.am
new file mode 100644
index 0000000..f403d78
--- /dev/null
+++ b/tests/buffer/tests/Makefile.am
@@ -0,0 +1 @@
+EXTRA_DIST = $(wildcard *.c)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]