Revert "Merge branch 'upstream' into tizen"

[platform/upstream/nettle.git] / testsuite / Makefile.in

diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 02c18fc..91f6e2a 100644 (file)
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -13,40 +13,31 @@ PRE_LDFLAGS = -L..
 TS_NETTLE_SOURCES = aes-test.c arcfour-test.c arctwo-test.c \
                    blowfish-test.c cast128-test.c \
                    base16-test.c base64-test.c \
-                   camellia-test.c chacha-test.c \
+                   camellia-test.c \
                    des-test.c des3-test.c des-compat-test.c \
                    md2-test.c md4-test.c md5-test.c md5-compat-test.c \
                    memxor-test.c gosthash94-test.c \
                    ripemd160-test.c \
                    salsa20-test.c \
                    sha1-test.c sha224-test.c sha256-test.c \
-                   sha384-test.c sha512-test.c sha512-224-test.c sha512-256-test.c \
+                   sha384-test.c sha512-test.c \
                    sha3-permute-test.c sha3-224-test.c sha3-256-test.c \
                    sha3-384-test.c sha3-512-test.c \
-                   serpent-test.c twofish-test.c version-test.c \
+                   serpent-test.c twofish-test.c \
                    knuth-lfib-test.c \
-                   cbc-test.c ctr-test.c gcm-test.c eax-test.c ccm-test.c \
-                   poly1305-test.c chacha-poly1305-test.c \
-                   hmac-test.c umac-test.c \
-                   meta-hash-test.c meta-cipher-test.c\
-                   meta-aead-test.c meta-armor-test.c \
+                   cbc-test.c ctr-test.c gcm-test.c hmac-test.c umac-test.c \
+                   meta-hash-test.c meta-cipher-test.c meta-armor-test.c \
                    buffer-test.c yarrow-test.c pbkdf2-test.c
 
 TS_HOGWEED_SOURCES = sexp-test.c sexp-format-test.c \
                     rsa2sexp-test.c sexp2rsa-test.c \
                     bignum-test.c random-prime-test.c \
-                    pkcs1-test.c rsa-sign-tr-test.c \
+                    pkcs1-test.c \
                     rsa-test.c rsa-encrypt-test.c rsa-keygen-test.c \
                     dsa-test.c dsa-keygen-test.c \
-                    curve25519-dh-test.c \
                     ecc-mod-test.c ecc-modinv-test.c ecc-redc-test.c \
-                    ecc-sqrt-test.c \
-                    ecc-dup-test.c ecc-add-test.c \
                     ecc-mul-g-test.c ecc-mul-a-test.c \
-                    ecdsa-sign-test.c ecdsa-verify-test.c \
-                    ecdsa-keygen-test.c ecdh-test.c \
-                    eddsa-compress-test.c eddsa-sign-test.c \
-                    eddsa-verify-test.c ed25519-test.c
+                    ecdsa-sign-test.c ecdsa-verify-test.c ecdsa-keygen-test.c
 
 TS_SOURCES = $(TS_NETTLE_SOURCES) $(TS_HOGWEED_SOURCES)
 CXX_SOURCES = cxx-test.cxx
@@ -56,20 +47,19 @@ TS_HOGWEED = $(TS_HOGWEED_SOURCES:.c=$(EXEEXT))
 TS_C = $(TS_NETTLE) @IF_HOGWEED@ $(TS_HOGWEED)
 TS_CXX = @IF_CXX@ $(CXX_SOURCES:.cxx=$(EXEEXT))
 TARGETS = $(TS_C) $(TS_CXX)
-TS_SH = sexp-conv-test pkcs1-conv-test nettle-pbkdf2-test symbols-test
-TS_ALL = $(TARGETS) $(TS_SH) @IF_DLOPEN_TEST@ dlopen-test$(EXEEXT)
+TS_SH = sexp-conv-test pkcs1-conv-test symbols-test
+TS_ALL = $(TARGETS) $(TS_SH)
 EXTRA_SOURCES = sha1-huge-test.c
 EXTRA_TARGETS = $(EXTRA_SOURCES:.c=$(EXEEXT))
 
-
 # Includes all C source files, regardless of configuration
-SOURCES = $(TS_SOURCES) $(EXTRA_SOURCES) testutils.c dlopen-test.c
+SOURCES = $(TS_SOURCES) $(EXTRA_SOURCES) testutils.c
 
 DISTFILES = $(SOURCES) $(CXX_SOURCES) Makefile.in .test-rules.make \
            $(TS_SH) setup-env teardown-env \
            gold-bug.txt testutils.h sha3.awk
 
-all: $(EXTRA_TARGETS)
+all: $(TARGETS) $(EXTRA_TARGETS)
 
 .c.$(OBJEXT):
        $(COMPILE) -c $< && $(DEP_PROCESS)
@@ -90,10 +80,6 @@ TEST_OBJS = testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
 ../nettle-internal.$(OBJEXT):
        ( cd .. && $(MAKE) nettle-internal.$(OBJEXT) )
 
-# Special target, to omit linking with libnettle
-dlopen-test$(EXEEXT): dlopen-test.$(OBJEXT) testutils.$(OBJEXT)
-       $(LINK) dlopen-test.$(OBJEXT) -ldl -o dlopen-test$(EXEEXT)
-
 .PHONY: test-rules
 test-rules:
        (for f in $(TS_NETTLE) $(TS_HOGWEED) $(EXTRA_TARGETS) ; do \
@@ -110,16 +96,14 @@ test-rules:
 include $(srcdir)/.test-rules.make
 
 $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \
-       ../libnettle.stamp @IF_HOGWEED@ ../libhogweed.stamp
+       ../libnettle.a @IF_HOGWEED@ ../libhogweed.a
 
 # For use as, e.g.,
 #
 #   make check EMULATOR='$(VALGRIND)'
 #   make check EMULATOR='$(VALGRIND) --log-fd=3' 3>valgrind.log
 
-# --partial-loads-ok=yes is needed for memxor's handling of unaligned
-# data.
-VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes
+VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes
 
 # The PATH update is for locating dlls on w*ndows.
 check: $(TS_ALL)
@@ -138,8 +122,7 @@ distdir: $(DISTFILES)
        cp $? $(distdir)
 
 clean:
-       -rm -f $(TARGETS) $(EXTRA_TARGETS) dlopen-test$(EXEEXT) \
-               *.o test.in test1.out test2.out
+       -rm -f $(TARGETS) $(EXTRA_TARGETS) *.o test.in test1.out test2.out
 
 distclean: clean
        -rm -f Makefile *.d