X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Ftestsuite%2FMakefile-files;h=3e9b2a161b40fa8caab4cbb22d6c6c13e9be8d99;hb=faa778968d1a7dfeaebc9fe4b847e691dc62fd15;hp=0483f11b705b8e04c11046534a55f56de3542b0f;hpb=52423e69ae95b5d71ee8d3ac1feaeea969b6a994;p=util-vserver.git diff --git a/util-vserver/src/testsuite/Makefile-files b/util-vserver/src/testsuite/Makefile-files index 0483f11..3e9b2a1 100644 --- a/util-vserver/src/testsuite/Makefile-files +++ b/util-vserver/src/testsuite/Makefile-files @@ -16,15 +16,27 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. src_testsuite_check_active_PRGS = src/testsuite/vunify-functest \ - src/testsuite/chcontext-test + src/testsuite/chcontext-test \ + src/testsuite/chbind-test + src_testsuite_check_passive_PRGS = src/testsuite/rpm-fake-test +if ENSC_HAVE_C99_COMPILER +if ENSC_HAVE_BEECRYPT +src_testsuite_check_passive_PRGS += src/testsuite/hashcalc \ + src/testsuite/hashcalc-plain +endif +endif -src_testsuite_check_PRGS = $(src_testsuite_check_passive_PRGS) \ +check_PROGRAMS += $(src_testsuite_check_passive_PRGS) \ $(src_testsuite_check_active_PRGS) if ENSC_HAVE_C99_COMPILER src_testsuite_check_src_C99_SCRPTS = src/testsuite/vunify-test.sh +if ENSC_HAVE_BEECRYPT +src_testsuite_check_src_C99_SCRPTS += src/testsuite/hashcalc-plain.sh \ + src/testsuite/hashcalc.sh +endif else src_testsuite_check_src_C99_SCRPTS = endif @@ -32,25 +44,48 @@ endif src_testsuite_check_src_SCRPTS = $(src_testsuite_check_src_C99_SCRPTS) src_testsuite_check_gen_SCRPTS = -src_testsuite_check_SCRPTS = $(src_testsuite_check_src_SCRPTS) \ +check_SCRIPTS += $(src_testsuite_check_src_SCRPTS) \ $(src_testsuite_check_gen_SCRPTS) -src_testsuite_TSTS = $(src_testsuite_check_active_PRGS) \ - $(src_testsuite_check_SCRPTS) - -src_testsuite_XTRAS = $(src_testsuite_check_src_SCRPTS) +TESTS += $(src_testsuite_check_active_PRGS) \ + $(src_testsuite_check_src_SCRPTS) \ + $(src_testsuite_check_gen_SCRPTS) +EXTRA_DIST += $(src_testsuite_check_src_SCRPTS) \ + src/testsuite/vunify-test.sh \ + src/testsuite/hashcalc.sh \ + src/testsuite/hashcalc-plain.sh \ + src/testsuite/vwait-test.sh src_testsuite_rpm_fake_test_SOURCES = src/testsuite/rpm-fake-test.c -src_testsuite_vunify_functest_SOURCES = src/testsuite/vunify-functest.c \ - src/vunify-matchlist.c +src_testsuite_vunify_functest_SOURCES = src/testsuite/vunify-functest.c +src_testsuite_vunify_functest_LDADD = $(LIBINTERNAL) src_testsuite_vunify_functest_CPPFLAGS= $(AM_CPPFLAGS) $(src_testsuite_CPPFLAGS) -src_testsuite_chcontext_test_SOURCES = src/testsuite/chcontext-test.c \ - src/util-exitlikeprocess.c -src_testsuite_chcontext_test_LDADD = lib/libvserver.la +src_testsuite_chcontext_test_SOURCES = src/testsuite/chcontext-test.c +src_testsuite_chcontext_test_LDADD = lib/libvserver.la $(LIBINTERNAL) + + +src_testsuite_chbind_test_SOURCES = src/testsuite/chbind-test.c +src_testsuite_chbind_test_LDADD = lib/libvserver.la + +src_testsuite_hashcalc_SOURCES = src/testsuite/hashcalc.c +src_testsuite_hashcalc_plain_SOURCES = src/testsuite/hashcalc-plain.c +if ENSC_CAN_BEECRYPT_WITH_DIETLIBC +src_testsuite_hashcalc_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS) +src_testsuite_hashcalc_LDFLAGS = $(VSERVER_LDFLGS) + +src_testsuite_hashcalc_plain_LDADD = $(LIBINTERNAL) $(LIBENSCVECTOR) -lbeecrypt $(VSERVER_LDADDS) +src_testsuite_hashcalc_plain_LDFLAGS = $(VSERVER_LDFLGS) +else +src_testsuite_hashcalc_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt +src_testsuite_hashcalc_LDFLAGS = + +src_testsuite_hashcalc_plain_LDADD = $(LIBINTERNAL_GLIBC) $(LIBENSCVECTOR_GLIBC) $(LIBVSERVER_GLIBC) -lbeecrypt +src_testsuite_hashcalc_plain_LDFLAGS = +endif src_testsuite_CPPFLAGS = -I $(top_srcdir)/src -D ENSC_TESTSUITE