Changeset 1220

Timestamp:

08/16/08 16:00:07 (4 months ago)

Author:

mbr

Message:

added --test-system-fwknop to the test suite so that the installed version of fwknop can be tested

Files:

• fwknop/trunk/test/fwknop_test.pl (modified) (3 diffs)

fwknop/trunk/test/fwknop_test.pl

@@ -102 +102 @@
-my $fwknop_conf_file    = '/etc/fwknop/fwknop.conf';
-my $cache_encrypted_spa_packet = '';
+my $test_system_installed_fwknop = 0;
-my $spa_packet_digest  = '';
-my $successful_tests   = 0;
@@ -174 +175 @@
-    'test-include=s'    => \$test_include,
-    'test-exclude=s'    => \$test_exclude,
+    'test-system-fwknop' => \$test_system_installed_fwknop,
-    'help'              => \$help
-);
@@ -2975 +2977 @@
-    }
-
+    if ($test_system_installed_fwknop) {
+        $fwknopCmd  = '/usr/bin/fwknop';
+        $fwknopdCmd = '/usr/sbin/fwknopd';
+        $knoptmCmd  = '/usr/sbin/knoptm';
+    }
+
-    for my $prog ($fwknopCmd, $fwknopdCmd, $knoptmCmd) {
-        die "[*] $prog does not exist" unless -e $prog;