Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7a85231
Fix make distcheck
Baptiste Daroussin committed 11 years ago
commit 7a852317031a453bc004984b3d4c265638e6b5f1
parent dfc6d26
7 files changed +17 -9
modified tests/Makefile.am
@@ -34,14 +34,15 @@ plist_SOURCES= lib/plist.c
plist_CFLAGS=		$(PRIVATE_INCS)

plist_LDADD=		$(GENERIC_LDADD)
- 
EXTRA_DIST=	frontend/png.ucl \
+ 
EXTRA_DIST=	frontend/png.uclin \
+ 
		frontend/sqlite3.uclin \

		Kyuafile \

		frontend/Kyuafile \

		frontend/annotate.shin \

		frontend/pkg.shin \

		frontend/search.shin \

		frontend/version.shin \
- 
		frontend/test_environment
+ 
		frontend/test_environment.shin



TESTS =

tests_programs=	pkg_printf pkg_validation plist
@@ -50,14 +51,21 @@ check_PROGRAMS= $(tests_programs)
check_SCRIPTS=	frontend/pkg.sh \

		frontend/annotate.sh \

		frontend/search.sh \
- 
		frontend/version.sh
+ 
		frontend/version.sh \
+ 
		frontend/test_environment.sh \
+ 
		frontend/png.ucl \
+ 
		frontend/sqlite3.ucl

CLEANFILES+=	${check_SCRIPTS}
- 
SUFFIXES = .sh
+ 
SUFFIXES = .sh .ucl



.shin.sh:

	@echo "    GEN   " $@;

	@install -m 755 $< $@
+ 
.uclin.ucl:
+ 
	@echo "    GEN   " $@;
+ 
	@install -m 644 $< $@
+ 


lib/pkg_printf.c:

	@echo "    CP    " $@;

	@cp $(top_srcdir)/libpkg/pkg_printf.c $@
modified tests/frontend/annotate.shin
@@ -90,7 +90,7 @@ annotate_body() {
}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment
+ 
        . $(atf_get_srcdir)/test_environment.sh



	# Tests are run in alphabetical order

	atf_add_test_case annotate
modified tests/frontend/pkg.shin
@@ -52,7 +52,7 @@ pkg_config_defaults_body()




atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment
+ 
        . $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case pkg_no_database

	atf_add_test_case pkg_config_defaults
modified tests/frontend/search.shin
@@ -11,7 +11,7 @@ search_body() {
}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment
+ 
        . $(atf_get_srcdir)/test_environment.sh



	unset PKG_DBDIR
deleted tests/frontend/test_environment
@@ -1 +0,0 @@
- 
export PATH=$(atf_get_srcdir)/../../src:${PATH}
added tests/frontend/test_environment.shin
@@ -0,0 +1 @@
+ 
export PATH=$(atf_get_srcdir)/../../src:${PATH}
modified tests/frontend/version.shin
@@ -13,7 +13,7 @@ version_body() {
}



atf_init_test_cases() {
- 
        . $(atf_get_srcdir)/test_environment
+ 
        . $(atf_get_srcdir)/test_environment.sh



	atf_add_test_case version

}