summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-08-17 15:47:08 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-08-17 15:47:08 +0200
commit92d5a40da433833380626b9678c4887568505b6d (patch)
treed84db4a7334213207d2a053e10605b835d891bd3 /test
parent224bdefc223703884918235819fe3b246e568f74 (diff)
for consistency allow the usage of 'make test' instead of './run-tests'
Diffstat (limited to 'test')
-rw-r--r--test/Makefile9
-rw-r--r--test/integration/makefile10
-rw-r--r--test/libapt/makefile4
3 files changed, 16 insertions, 7 deletions
diff --git a/test/Makefile b/test/Makefile
index f918f7d2e..da0a49b0c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -6,16 +6,11 @@ ifndef NOISY
.SILENT:
endif
-.PHONY: headers library clean veryclean all binary program doc
-all clean veryclean binary program dirs:
+.PHONY: headers library clean veryclean all binary program doc test
+all clean veryclean binary program dirs test:
$(MAKE) -C libapt $@
$(MAKE) -C interactive-helper $@
# Some very common aliases
.PHONY: maintainer-clean dist-clean distclean pristine sanity
maintainer-clean dist-clean distclean pristine sanity: veryclean
-
-
-.PHONY: test
-test:
- ./libapt/run-tests
diff --git a/test/integration/makefile b/test/integration/makefile
new file mode 100644
index 000000000..fb12fe9a8
--- /dev/null
+++ b/test/integration/makefile
@@ -0,0 +1,10 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=test/integration
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+.PHONY: test
+test:
+ ./run-tests
diff --git a/test/libapt/makefile b/test/libapt/makefile
index 366907d89..b3f2f4274 100644
--- a/test/libapt/makefile
+++ b/test/libapt/makefile
@@ -6,6 +6,10 @@ BASENAME=_libapt_test
# Bring in the default rules
include ../../buildlib/defaults.mak
+.PHONY: test
+test:
+ ./run-tests
+
# Program for testing getLanguageCode
PROGRAM = getLanguages${BASENAME}
SLIBS = -lapt-pkg