From 876e5a41959a594413d85a76f32e704ea16b6065 Mon Sep 17 00:00:00 2001
From: Bart Van Assche <bart.vanassche@sandisk.com>
Date: Fri, 18 Dec 2015 11:45:33 +0000
Subject: [PATCH] Merged revisions 6768-6769 via svnmerge from
 svn+ssh://svn.code.sf.net/p/scst/svn/trunk

........
  r6768 | bvassche | 2015-12-18 12:05:20 +0100 (Fri, 18 Dec 2015) | 1 line

  scstadmin: Suppress warnings about the use of an undefined value in numeric ne (!=)
........
  r6769 | bvassche | 2015-12-18 12:39:19 +0100 (Fri, 18 Dec 2015) | 1 line

  scst regression test 7: Fix $redirect_file initialization
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.1.x@6770 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm    | 2 +-
 .../scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t     | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
index 6bef8619b..5fca60f2e 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/lib/SCST/SCST.pm
@@ -929,7 +929,7 @@ sub driverExists {
 	    opendir($dHandle, make_path(SCST_TARGETS_DIR(), $driver));
 	close $dHandle if ($result);
 
-	return $result;
+	return $result ? TRUE : FALSE;
 }
 
 sub driverDynamicAttributes {
diff --git a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
index 352481b90..58e149049 100644
--- a/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
+++ b/scstadmin/scstadmin.sysfs/scst-1.0.0/t/07-scstadmin-args.t
@@ -7,17 +7,16 @@ use File::Spec;
 use Test;
 
 my $testdir;
-my $scstadmin_pm_dir;
-my $scstadmin_dir;
 my $scstadmin;
-my $redirect_file = "/tmp/07-output.txt";
+my $redirect_file;
 my $redirect;
 
 BEGIN {
+    $redirect_file = "/tmp/07-output.txt";
     unlink($redirect_file);
     $testdir = dirname(abs_path($0));
-    $scstadmin_pm_dir = dirname($testdir);
-    $scstadmin_dir = dirname($scstadmin_pm_dir);
+    my $scstadmin_pm_dir = dirname($testdir);
+    my $scstadmin_dir = dirname($scstadmin_pm_dir);
     $scstadmin = File::Spec->catfile($scstadmin_dir, "scstadmin");
     unless(grep /blib/, @INC) {
 	unshift(@INC, File::Spec->catdir($scstadmin_pm_dir, "lib"));