packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: Move test-varint and test-rollsum under "make check" 

"make check" tests are always enabled and they do not require to be
installed.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano 2015-02-02 12:56:40 +01:00
parent 6a3959c895
commit 53122dd2f9
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Makefile-tests.am
View File

@ -19,7 +19,6 @@
if BUILDOPT_INSTALL_TESTS if BUILDOPT_INSTALL_TESTS
insttest_PROGRAMS =
insttestdir=$(pkglibexecdir)/installed-tests insttestdir=$(pkglibexecdir)/installed-tests
testfiles = test-basic \ testfiles = test-basic \
@ -94,23 +93,6 @@ INSTALL_DATA_HOOKS += install-gpg-data-hook
echo 'Type=session' >> $@.tmp; \ echo 'Type=session' >> $@.tmp; \
mv $@.tmp $@) mv $@.tmp $@)
%.test: tests/%.c Makefile
$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
echo 'Exec=$(pkglibexecdir)/installed-tests/$(notdir $(<:.c=))' >> $@.tmp; \
echo 'Type=session' >> $@.tmp; \
mv $@.tmp $@)
insttest_PROGRAMS += test-varint
test_varint_SOURCES = src/libostree/ostree-varint.c tests/test-varint.c
test_varint_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
test_varint_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
testmeta_DATA += test-varint.test
insttest_PROGRAMS += test-rollsum
test_rollsum_SOURCES = src/libostree/bupsplit.c tests/test-rollsum.c
test_rollsum_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
test_rollsum_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
if BUILDOPT_GJS if BUILDOPT_GJS
insttest_SCRIPTS += tests/test-core.js \ insttest_SCRIPTS += tests/test-core.js \
tests/test-sizes.js \ tests/test-sizes.js \
@ -120,3 +102,16 @@ testmeta_DATA += test-core.test test-sizes.test test-sysroot.test
endif endif
endif endif
# "make check" do not depend from --enable-installed-tests
check_PROGRAMS = tests/test-rollsum tests/test-varint
tests_test_rollsum_SOURCES = src/libostree/bupsplit.c tests/test-rollsum.c
tests_test_rollsum_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
tests_test_rollsum_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
tests_test_varint_SOURCES = src/libostree/ostree-varint.c tests/test-varint.c
tests_test_varint_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
tests_test_varint_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
TESTS = tests/test-rollsum tests/test-varint

5
Makefile.am
View File

@ -84,7 +84,8 @@ release-tarball-embedded:
check-local: check-local:
@echo " *** NOTE ***" @echo " *** NOTE ***"
@echo " *** NOTE ***" @echo " *** NOTE ***"
@echo " ostree only supports https://live.gnome.org/GnomeGoals/InstalledTests" @echo " \"make check\" only runs a subset of OSTree's tests."
@echo " To run them, ostree must be configured with --enable-installed-tests and installed" @echo " The other tests use: use https://live.gnome.org/GnomeGoals/InstalledTests"
@echo " To run them, ostree must be configured with --enable-installed-tests and installed"
@echo " *** NOTE ***" @echo " *** NOTE ***"
@echo " *** NOTE ***" @echo " *** NOTE ***"

2
configure.ac
View File

@ -4,7 +4,7 @@ AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([1.11 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz]) AM_INIT_AUTOMAKE([1.13 -Wno-portability foreign no-define tar-ustar no-dist-gzip dist-xz color-tests parallel-tests])
AM_MAINTAINER_MODE([enable]) AM_MAINTAINER_MODE([enable])
AM_SILENT_RULES([yes]) AM_SILENT_RULES([yes])
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS