From 2464a25de75a1a442b2cef5f7d2f63f84fab8c55 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cynapses.org>
Date: Mon, 3 Jan 2011 09:02:34 +0100
Subject: tests: Fixed a build warning introduced before.

---
 tests/client/torture_algorithms.c   | 5 ++---
 tests/client/torture_auth.c         | 5 ++---
 tests/client/torture_knownhosts.c   | 5 ++---
 tests/client/torture_proxycommand.c | 6 +++---
 tests/client/torture_sftp_static.c  | 5 ++---
 5 files changed, 11 insertions(+), 15 deletions(-)

(limited to 'tests/client')

diff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c
index a32ea01..8f51d40 100644
--- a/tests/client/torture_algorithms.c
+++ b/tests/client/torture_algorithms.c
@@ -150,9 +150,6 @@ static void torture_algorithms_zlib_openssh(void **state) {
 
 int torture_run_tests(void) {
     int rc;
-
-    ssh_init();
-
     const UnitTest tests[] = {
         unit_test_setup_teardown(torture_algorithms_aes128_cbc, setup, teardown),
         unit_test_setup_teardown(torture_algorithms_aes192_cbc, setup, teardown),
@@ -166,6 +163,8 @@ int torture_run_tests(void) {
         unit_test_setup_teardown(torture_algorithms_zlib_openssh, setup, teardown),
     };
 
+    ssh_init();
+
     rc = run_tests(tests);
     ssh_finalize();
 
diff --git a/tests/client/torture_auth.c b/tests/client/torture_auth.c
index 7c90fec..adcf708 100644
--- a/tests/client/torture_auth.c
+++ b/tests/client/torture_auth.c
@@ -153,15 +153,14 @@ static void torture_auth_password(void **state) {
 
 int torture_run_tests(void) {
     int rc;
-
-    ssh_init();
-
     const UnitTest tests[] = {
         unit_test_setup_teardown(torture_auth_kbdint, setup, teardown),
         unit_test_setup_teardown(torture_auth_password, setup, teardown),
         unit_test_setup_teardown(torture_auth_autopubkey, setup, teardown),
     };
 
+    ssh_init();
+
     rc = run_tests(tests);
     ssh_finalize();
 
diff --git a/tests/client/torture_knownhosts.c b/tests/client/torture_knownhosts.c
index 1bb949e..9c44c9e 100644
--- a/tests/client/torture_knownhosts.c
+++ b/tests/client/torture_knownhosts.c
@@ -93,13 +93,12 @@ static void torture_knownhosts_port(void **state) {
 
 int torture_run_tests(void) {
     int rc;
-
-    ssh_init();
-
     const UnitTest tests[] = {
         unit_test_setup_teardown(torture_knownhosts_port, setup, teardown),
     };
 
+    ssh_init();
+
     rc = run_tests(tests);
     ssh_finalize();
 
diff --git a/tests/client/torture_proxycommand.c b/tests/client/torture_proxycommand.c
index 218b457..8cf6868 100644
--- a/tests/client/torture_proxycommand.c
+++ b/tests/client/torture_proxycommand.c
@@ -42,14 +42,14 @@ static void torture_options_set_proxycommand_notexist(void **state) {
 
 int torture_run_tests(void) {
     int rc;
-
-    ssh_init();
-
     const UnitTest tests[] = {
         unit_test_setup_teardown(torture_options_set_proxycommand, setup, teardown),
         unit_test_setup_teardown(torture_options_set_proxycommand_notexist, setup, teardown),
     };
 
+
+    ssh_init();
+
     rc = run_tests(tests);
     ssh_finalize();
 
diff --git a/tests/client/torture_sftp_static.c b/tests/client/torture_sftp_static.c
index ba3cfd4..7631def 100644
--- a/tests/client/torture_sftp_static.c
+++ b/tests/client/torture_sftp_static.c
@@ -19,13 +19,12 @@ static void torture_sftp_ext_new(void **state) {
 
 int torture_run_tests(void) {
     int rc;
-
-    ssh_init();
-
     const UnitTest tests[] = {
         unit_test(torture_sftp_ext_new),
     };
 
+    ssh_init();
+
     rc = run_tests(tests);
     ssh_finalize();
 
-- 
cgit v1.2.3