tests: eliminated exit_code variable used in few tests

It was a legacy variable for error printing that was never
used uniformly.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

19 files changed, 0 insertions, 172 deletions

diff --git a/tests/auto-verify.c b/tests/auto-verify.c
index 404a1ea9eb..34cae5ccd2 100644
--- a/tests/auto-verify.c
+++ b/tests/auto-verify.c
@@ -183,7 +183,6 @@ const gnutls_datum_t server_key = { server_key_pem,
 static
 void test_failure(const char *name, const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -298,19 +297,11 @@ void test_failure(const char *name, const char *prio)
 
 	gnutls_certificate_free_credentials(serverx509cred);
 	gnutls_certificate_free_credentials(clientx509cred);
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			fprintf(stderr, "%s: Self-test successful", __func__);
-		else
-			fprintf(stderr, "%s: Self-test failed", __func__);
-	}
 }
 
 static
 void test_success1(const char *name, const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -425,19 +416,11 @@ void test_success1(const char *name, const char *prio)
 
 	gnutls_certificate_free_credentials(serverx509cred);
 	gnutls_certificate_free_credentials(clientx509cred);
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			fprintf(stderr, "%s: Self-test successful", __func__);
-		else
-			fprintf(stderr, "%s: Self-test failed", __func__);
-	}
 }
 
 static
 void test_success2(const char *name, const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -542,13 +525,6 @@ void test_success2(const char *name, const char *prio)
 
 	gnutls_certificate_free_credentials(serverx509cred);
 	gnutls_certificate_free_credentials(clientx509cred);
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			fprintf(stderr, "%s: Self-test successful", __func__);
-		else
-			fprintf(stderr, "%s: Self-test failed", __func__);
-	}
 }
 
 void doit(void)
diff --git a/tests/key-usage-ecdhe-rsa.c b/tests/key-usage-ecdhe-rsa.c
index 976c826026..4926d2be9a 100644
--- a/tests/key-usage-ecdhe-rsa.c
+++ b/tests/key-usage-ecdhe-rsa.c
@@ -108,7 +108,6 @@ const gnutls_datum_t enc_key = { encryption_key_pem,
 static
 void server_check(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -176,13 +175,6 @@ void server_check(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
 
 static gnutls_privkey_t g_pkey = NULL;
@@ -233,7 +225,6 @@ cert_callback(gnutls_session_t session,
 static
 void client_check(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -299,13 +290,6 @@ void client_check(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
 
 void doit(void)
diff --git a/tests/key-usage-rsa.c b/tests/key-usage-rsa.c
index 42490df250..5eb2cfef83 100644
--- a/tests/key-usage-rsa.c
+++ b/tests/key-usage-rsa.c
@@ -147,7 +147,6 @@ const gnutls_datum_t server_key = { server_key_pem,
 static
 void server_check(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -215,13 +214,6 @@ void server_check(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
 
 static gnutls_privkey_t g_pkey = NULL;
@@ -272,7 +264,6 @@ cert_callback(gnutls_session_t session,
 static
 void client_check(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -338,13 +329,6 @@ void client_check(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
 
 void doit(void)
diff --git a/tests/mini-x509-2.c b/tests/mini-x509-2.c
index cab8c9ae2b..8badfc1ecb 100644
--- a/tests/mini-x509-2.c
+++ b/tests/mini-x509-2.c
@@ -182,7 +182,6 @@ const gnutls_datum_t server_key = { server_key_pem,
 static
 void start(const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
diff --git a/tests/mini-x509-cas.c b/tests/mini-x509-cas.c
index 6edfd89c38..818d98ec53 100644
--- a/tests/mini-x509-cas.c
+++ b/tests/mini-x509-cas.c
@@ -47,7 +47,6 @@ static void tls_log_func(int level, const char *str)
 static
 void start(const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	const char *ca_file;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
diff --git a/tests/mini-x509-default-prio.c b/tests/mini-x509-default-prio.c
index 62ef5b55ff..7f2308cde4 100644
--- a/tests/mini-x509-default-prio.c
+++ b/tests/mini-x509-default-prio.c
@@ -142,7 +142,6 @@ const gnutls_datum_t server_key = { server_key_pem,
 
 void doit(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -283,11 +282,4 @@ void doit(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
diff --git a/tests/mini-x509-ipaddr.c b/tests/mini-x509-ipaddr.c
index 63d6fecd5c..81ce0525cc 100644
--- a/tests/mini-x509-ipaddr.c
+++ b/tests/mini-x509-ipaddr.c
@@ -58,7 +58,6 @@ static time_t mytime(time_t * t)
 
 void doit(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -267,11 +266,4 @@ void doit(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
diff --git a/tests/mini-x509.c b/tests/mini-x509.c
index 280ffcbc49..4e9d27b639 100644
--- a/tests/mini-x509.c
+++ b/tests/mini-x509.c
@@ -54,7 +54,6 @@ static time_t mytime(time_t * t)
 static
 void start(const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
diff --git a/tests/priority-mix.c b/tests/priority-mix.c
index ff9393738e..55053ae768 100644
--- a/tests/priority-mix.c
+++ b/tests/priority-mix.c
@@ -57,7 +57,6 @@ static time_t mytime(time_t * t)
 
 void doit(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -162,11 +161,4 @@ void doit(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
diff --git a/tests/priority-set.c b/tests/priority-set.c
index 63f61dd01d..1834d800a1 100644
--- a/tests/priority-set.c
+++ b/tests/priority-set.c
@@ -57,7 +57,6 @@ static time_t mytime(time_t * t)
 
 void doit(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -125,11 +124,4 @@ void doit(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
diff --git a/tests/priority-set2.c b/tests/priority-set2.c
index e1187e75a3..18b03d86ee 100644
--- a/tests/priority-set2.c
+++ b/tests/priority-set2.c
@@ -57,7 +57,6 @@ static time_t mytime(time_t * t)
 
 void doit(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -126,11 +125,4 @@ void doit(void)
 	gnutls_priority_deinit(cache);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
diff --git a/tests/rehandshake-ext-secret.c b/tests/rehandshake-ext-secret.c
index 4532f306bf..94279f0322 100644
--- a/tests/rehandshake-ext-secret.c
+++ b/tests/rehandshake-ext-secret.c
@@ -49,7 +49,6 @@ static void tls_log_func(int level, const char *str)
 
 static void try(unsigned onclient)
 {
-	int exit_code = EXIT_SUCCESS;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
 	gnutls_session_t server;
@@ -139,13 +138,6 @@ static void try(unsigned onclient)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
 
 void doit(void)
diff --git a/tests/resume-with-false-start.c b/tests/resume-with-false-start.c
index b0093b09e0..26f374c841 100644
--- a/tests/resume-with-false-start.c
+++ b/tests/resume-with-false-start.c
@@ -52,7 +52,6 @@ static time_t mytime(time_t * t)
 
 void doit(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -146,11 +145,4 @@ void doit(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
diff --git a/tests/session-rdn-read.c b/tests/session-rdn-read.c
index c308508596..19cbfb057c 100644
--- a/tests/session-rdn-read.c
+++ b/tests/session-rdn-read.c
@@ -86,7 +86,6 @@ cert_callback(gnutls_session_t session,
 
 static void start(const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -164,13 +163,6 @@ static void start(const char *prio)
 
 	gnutls_global_deinit();
 
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
-
 	reset_buffers();
 }
 
diff --git a/tests/tls12-rehandshake-cert.c b/tests/tls12-rehandshake-cert.c
index 36660cc15c..998d997363 100644
--- a/tests/tls12-rehandshake-cert.c
+++ b/tests/tls12-rehandshake-cert.c
@@ -46,7 +46,6 @@ static void tls_log_func(int level, const char *str)
 
 void doit(void)
 {
-	int exit_code = EXIT_SUCCESS;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
 	gnutls_session_t server;
@@ -114,11 +113,4 @@ void doit(void)
 	gnutls_certificate_free_credentials(clientx509cred);
 
 	gnutls_global_deinit();
-
-	if (debug) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
 }
diff --git a/tests/utils-adv.c b/tests/utils-adv.c
index a084136646..8291e182ab 100644
--- a/tests/utils-adv.c
+++ b/tests/utils-adv.c
@@ -53,7 +53,6 @@ _test_cli_serv(gnutls_certificate_credentials_t server_cred,
 	      int serv_err,
 	      int cli_err)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_session_t server;
@@ -178,13 +177,6 @@ _test_cli_serv(gnutls_certificate_credentials_t server_cred,
 	gnutls_deinit(client);
 	gnutls_deinit(server);
 
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
-
 	return ret;
 }
 
@@ -203,7 +195,6 @@ test_cli_serv_anon(gnutls_anon_server_credentials_t server_cred,
 	      gnutls_anon_client_credentials_t client_cred,
 	      const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_session_t server;
@@ -248,13 +239,6 @@ test_cli_serv_anon(gnutls_anon_server_credentials_t server_cred,
 	gnutls_deinit(client);
 	gnutls_deinit(server);
 
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
-
 	return ret;
 }
 
@@ -263,7 +247,6 @@ test_cli_serv_psk(gnutls_psk_server_credentials_t server_cred,
 	      gnutls_psk_client_credentials_t client_cred,
 	      const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_session_t server;
@@ -308,13 +291,6 @@ test_cli_serv_psk(gnutls_psk_server_credentials_t server_cred,
 	gnutls_deinit(client);
 	gnutls_deinit(server);
 
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
-
 	return ret;
 }
 
diff --git a/tests/x509-cert-callback-legacy.c b/tests/x509-cert-callback-legacy.c
index 98ae7dbd9c..2f7912bd89 100644
--- a/tests/x509-cert-callback-legacy.c
+++ b/tests/x509-cert-callback-legacy.c
@@ -136,7 +136,6 @@ server_cert_callback(gnutls_session_t session,
 
 static void start(const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
diff --git a/tests/x509-cert-callback-ocsp.c b/tests/x509-cert-callback-ocsp.c
index 771b3c3b96..31325d1817 100644
--- a/tests/x509-cert-callback-ocsp.c
+++ b/tests/x509-cert-callback-ocsp.c
@@ -124,7 +124,6 @@ server_cert_callback(gnutls_session_t session,
 
 static void start(const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t scred;
@@ -220,13 +219,6 @@ static void start(const char *prio)
 
 	gnutls_global_deinit();
 
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
-
 	reset_buffers();
 }
 
diff --git a/tests/x509-cert-callback.c b/tests/x509-cert-callback.c
index e673096195..2901208c12 100644
--- a/tests/x509-cert-callback.c
+++ b/tests/x509-cert-callback.c
@@ -173,7 +173,6 @@ server_cert_callback(gnutls_session_t session,
 
 static void start(const char *prio)
 {
-	int exit_code = EXIT_SUCCESS;
 	int ret;
 	/* Server stuff. */
 	gnutls_certificate_credentials_t serverx509cred;
@@ -416,13 +415,6 @@ static void start(const char *prio)
 
 	gnutls_global_deinit();
 
-	if (debug > 0) {
-		if (exit_code == 0)
-			puts("Self-test successful");
-		else
-			puts("Self-test failed");
-	}
-
 	reset_buffers();
 }