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=6575e8c9443b11228f250059da1426bc6fd6afab;hpb=c39d27ba32c6241ddc5e773bb55813c06f0d6ea7;p=util-vserver.git diff --git a/util-vserver/src/testsuite/Makefile-files b/util-vserver/src/testsuite/Makefile-files index 6575e8c..3e9b2a1 100644 --- a/util-vserver/src/testsuite/Makefile-files +++ b/util-vserver/src/testsuite/Makefile-files @@ -23,7 +23,8 @@ 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_check_passive_PRGS += src/testsuite/hashcalc \ + src/testsuite/hashcalc-plain endif endif @@ -32,6 +33,10 @@ check_PROGRAMS += $(src_testsuite_check_passive_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 @@ -46,8 +51,11 @@ TESTS += $(src_testsuite_check_active_PRGS) \ $(src_testsuite_check_src_SCRPTS) \ $(src_testsuite_check_gen_SCRPTS) -EXTRA_DIST += $(src_testsuite_check_src_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 @@ -64,12 +72,19 @@ 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