added yum-2.6.0-chroot.patch
[util-vserver.git] / util-vserver / src / testsuite / Makefile-files
index 3edd389..3e9b2a1 100644 (file)
@@ -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
 
@@ -33,7 +34,8 @@ 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.sh
+src_testsuite_check_src_C99_SCRPTS +=  src/testsuite/hashcalc-plain.sh         \
+                                       src/testsuite/hashcalc.sh
 endif
 else
 src_testsuite_check_src_C99_SCRPTS =
@@ -52,6 +54,7 @@ TESTS +=                              $(src_testsuite_check_active_PRGS) \
 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
@@ -69,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