From: Arnaud Garin <arnaud.garin@baculasystems.com>
Date: Wed, 15 Sep 2021 06:53:08 +0000 (+0200)
Subject: Updated help command + basic regress structure
X-Git-Tag: Beta-15.0.0~888
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90475de8730e9dc24488f4003ce542903c34c2f8;p=thirdparty%2Fbacula.git

Updated help command + basic regress structure
---

diff --git a/bacula/src/tools/bjoblist.c b/bacula/src/tools/bjoblist.c
index 8d667c4a4..a85de0c02 100644
--- a/bacula/src/tools/bjoblist.c
+++ b/bacula/src/tools/bjoblist.c
@@ -105,12 +105,14 @@ int main(int argc, char *argv[])
 					"\t-k\tKey (hostname + volume name)\n"
 					"\t-p\tPrevious job\n"
 					"\t-j\tCurrent job\n"
-					"\t-l\tLevel {(f)ull, (d)ifferential, (i)ncremental}\n"
+					"\t-l\tLevel {(F)ull, (D)ifferential, (I)ncremental}\n"
 					"\t-D\tData XXX-XXX-XXX-XXX-XXX\n"
 					"\t-s\tStore-mode\n"
 					"\t-S\tSearch-mode\n"
 					"\t-d\tDebug-level\n"
 					"\t-h\t display this text\n\n");
+			
+			exit(EXIT_SUCCESS);
 		}
 	}
 	
diff --git a/regress/tests/bjoblist-test b/regress/tests/bjoblist-test
new file mode 100755
index 000000000..d3109fa7c
--- /dev/null
+++ b/regress/tests/bjoblist-test
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# Copyright (C) 2000-2015 Kern Sibbald
+# License: BSD 2-Clause; see file LICENSE-FOSS
+#
+
+TestName="bjoblist-test"
+JobName="bjoblist-test"
+
+. scripts/functions
+
+scripts/cleanup
+scripts/copy-confs
+
+bjoblist=${bin}/bjoblist
+
+# Various key setup
+key1="netapp:/vol/vol1"
+key2="netapp:/vol/vol2"
+key3="netapp:/vol/vol2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
+key4="netapp:/vol/vol2xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxz"
+
+#vVarious data setup
+data1="ID=704ba403-fa5d-45f9-8681-859eec950723 DATE=1:15f18c5c-3824-40d2-8843-e6d161f77504:15f18c5c-3824-40d2-8843-e6d161f77504"
+data2="ID=704ba403-fa5d-45f9-8681-859eec950723 DATE=2:15f18c5c-3824-40d2-8843-e6d161f77504:15f18c5c-3824-40d2-8843-e6d161f77504"
+data3="ID=704ba403-fa5d-45f9-8681-859eec950723 DATE=3:15f18c5c-3824-40d2-8843-e6d161f77504:15f18c5c-3824-40d2-8843-e6d161f77504"
+data4="ID=704ba403-fa5d-45f9-8681-859eec950723 DATE=4:15f18c5c-3824-40d2-8843-e6d161f77504:15f18c5c-3824-40d2-8843-e6d161f77504"
+data5="ID=704ba403-fa5d-45f9-8681-859eec950723 DATE=5:15f18c5c-3824-40d2-8843-e6d161f77504:15f18c5c-3824-40d2-8843-e6d161f77504"
+
+# Various job setup
+jobF="Test1.2020-03-12_09.45.31_24"
+jobI="Test1.2020-03-12_09.45.31_25"
+jobI2="Test1.2020-03-12_09.45.31_26"
+jobD="Test1.2020-03-12_09.45.31_27"
+jobI3="Test1.2020-03-12_09.45.31_28"
+
+#vData file
+data_file="nutanixfiler.dat"
+
+# Working dir
+working_dir="/opt/bacula/working"
+
+"$bjoblist" -h
+
+
+exit 1
+