tests: remove shell-script wrapper for tls13/prf-early

The wrapper (tls13/prf-early.sh) was merely for running
tls13/prf-early under datefudge.  The same thing can now be done with
virt_time_init_at.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0955b6402b66dc44e95682beb3a581d02546ab9f..be847f6ec4ee2ec3f5bd3f358cea84ad9b622d6b 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -107,11 +107,12 @@ noinst_LTLIBRARIES = libutils.la
 libutils_la_SOURCES = utils.h utils.c seccomp.c utils-adv.c
 libutils_la_LIBADD = ../lib/libgnutls.la
 
-indirect_tests = tls13/prf-early system-override-hash system-override-sig
+indirect_tests = system-override-hash system-override-sig
 
 ctests = tls13/supported_versions tls13/tls12-no-tls13-exts \
        tls13/post-handshake-with-cert tls13/post-handshake-without-cert \
-       tls13/cookie tls13/key_share tls13/prf tls13/post-handshake-with-cert-ticket \
+       tls13/cookie tls13/key_share tls13/prf tls13/prf-early \
+       tls13/post-handshake-with-cert-ticket \
        tls12-rollback-detection tls11-rollback-detection \
        tls12-check-rollback-val tls11-check-rollback-val \
        tls13/post-handshake-with-psk tls13/post-handshake-with-cert-auto \
@@ -477,7 +478,7 @@ pkcs11_tls_neg_pkcs11_no_key_LDADD = $(LDADD) $(LIBDL)
 endif
 endif
 
-dist_check_SCRIPTS = rfc2253-escape-test.sh rsa-md5-collision/rsa-md5-collision.sh systemkey.sh tls13/prf-early.sh
+dist_check_SCRIPTS = rfc2253-escape-test.sh rsa-md5-collision/rsa-md5-collision.sh systemkey.sh
 
 if !WINDOWS
 

diff --git a/tests/tls13/prf-early.c b/tests/tls13/prf-early.c
index 3d9462848a608f392c2123ae5a7cf98f394d46ed..cd4813671c1e0d29d8e8ccd99888cf5637266d9c 100644 (file)
--- a/tests/tls13/prf-early.c
+++ b/tests/tls13/prf-early.c
@@ -160,7 +160,8 @@ static void client(int sds[])
 
        global_init();
 
-       virt_time_init();
+       /* date --date='TZ="UTC" 2019-04-12' +%s */
+       virt_time_init_at(1555027200);
 
        if (debug) {
                gnutls_global_set_log_function(client_log_func);
@@ -302,7 +303,8 @@ static void server(int sds[])
         */
        global_init();
 
-       virt_time_init();
+       /* date --date='TZ="UTC" 2019-04-12' +%s */
+       virt_time_init_at(1555027200);
 
        if (debug) {
                gnutls_global_set_log_function(server_log_func);

diff --git a/tests/tls13/prf-early.sh b/tests/tls13/prf-early.sh
deleted file mode 100755 (executable)
index 755ae35..0000000
--- a/tests/tls13/prf-early.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-# Copyright (C) 2019 Daiki Ueno
-#
-# This file is part of GnuTLS.
-#
-# GnuTLS is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at
-# your option) any later version.
-#
-# GnuTLS is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>
-#
-
-: ${srcdir=.}
-: ${builddir=.}
-
-. "${srcdir}/scripts/common.sh"
-
-skip_if_no_datefudge
-
-datefudge -s 2019-04-12 "${builddir}/tls13/prf-early" "$@"
-exit $?