X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=installcheck%2Famserverconfig.pl;h=e273745d892a189fabd3757b30e03fa6409f78c1;hb=refs%2Fheads%2Fmaster;hp=5b61ae3a3e8afd6f15a33fd04cf60d2f8d8f69b3;hpb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;p=debian%2Famanda

diff --git a/installcheck/amserverconfig.pl b/installcheck/amserverconfig.pl
index 5b61ae3..e273745 100644
--- a/installcheck/amserverconfig.pl
+++ b/installcheck/amserverconfig.pl
@@ -1,8 +1,9 @@
-# Copyright (c) 2010 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2010-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 as published
-# by the Free Software Foundation.
+# This program 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 2
+# of the License, or (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -16,7 +17,7 @@
 # Contact information: Zmanda Inc, 465 S. Mathilda Ave., Suite 300
 # Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
 
-use Test::More tests => 8;
+use Test::More tests => 10;
 
 use lib "@amperldir@";
 use File::Path;
@@ -45,19 +46,28 @@ sub config_ok {
 Installcheck::Run::cleanup();
 ok(run("$sbindir/amserverconfig", 'TESTCONF', '--template', 'S3'),
     "amserverconfig with S3 template")
-    or diag($Installcheck::Run::stderr);
+    or diag($Installcheck::Run::stdout);
 config_ok();
 
 Installcheck::Run::cleanup();
 ok(run("$sbindir/amserverconfig", 'TESTCONF', '--template', 'harddisk'),
     "amserverconfig with harddisk template")
-    or diag($Installcheck::Run::stderr);
+    or diag($Installcheck::Run::stdout);
+config_ok();
+
+Installcheck::Run::cleanup();
+mkpath(Installcheck::Run::vtape_dir());
+ok(run("$sbindir/amserverconfig", 'TESTCONF', '--template', 'harddisk',
+		    '--tapecycle', '2',
+		    '--tapedev', Installcheck::Run::vtape_dir()),
+    "amserverconfig with harddisk template and tapedev and tapecycle")
+    or diag($Installcheck::Run::stdout);
 config_ok();
 
 Installcheck::Run::cleanup();
 ok(run("$sbindir/amserverconfig", 'TESTCONF', '--template', 'single-tape'),
     "amserverconfig with single-tape template")
-    or diag($Installcheck::Run::stderr);
+    or diag($Installcheck::Run::stdout);
 config_ok();
 
 SKIP: {
@@ -66,7 +76,7 @@ SKIP: {
     Installcheck::Run::cleanup();
     ok(run("$sbindir/amserverconfig", 'TESTCONF', '--template', 'tape-changer'),
 	"amserverconfig with tape-changer template")
-	or diag($Installcheck::Run::stderr);
+	or diag($Installcheck::Run::stdout);
     config_ok();
 }