Merge branch 'main' of https://github.com/performancecopilot/pcp

qa/1067

@@ -42,11 +42,11 @@ in
     2.[0-2].*)
     		ln $seq.out.0 $seq.out
 		;;
-    2.4.*|3.*|4.*|5.*)
+    2.4.*|3.*|4.*|5.*|6.*)
     		ln $seq.out.1 $seq.out
     		;;
     *)		echo "Botch: need to know what output to expect for zabbix_agent version $version"
-    		exit
+    		exit 1
 		;;
 esac
 

qa/1973

@@ -0,0 +1,50 @@
+#!/bin/sh
+# PCP QA Test No. 1973
+# Exercise various pcp-zoneinfo(1) command options.
+#
+# Copyright (c) 2023 Oracle and/or its affiliates.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+
+if [ $# -eq 0 ]
+then
+    seq=`basename $0`
+    echo "QA output created by $seq"
+else
+    # use $seq from caller, unless not set
+    [ -n "$seq" ] || seq=`basename $0`
+    echo "QA output created by `basename $0` $*"
+fi
+
+# get standard environment, filters and checks
+. ./common.python
+
+__version=`$python --version 2>&1 | sed -e 's/Python //'`
+case "$__version"
+in
+    2.7.5)	_notrun "Python $__version reports start seconds off-by one for some processes"
+    		;;
+esac
+
+status=1        # failure is the default!
+$sudo rm -rf $tmp.* $seq.full
+trap "cd $here; rm -rf $tmp.*; exit \$status" 0 1 2 3 15
+
+pcp_zoneinfo="$PCP_BINADM_DIR/pcp-zoneinfo"
+test -x $pcp_zoneinfo || _notrun "No pcp-zoneinfo(1) installed"
+pcp_zoneinfo="$python $pcp_zoneinfo"
+
+# real QA test starts here
+echo && echo pcp-zoneinfo output : Display default output
+PCP_ARCHIVE="archives/pcp-zoneinfo" PCP_HOSTZONE=1 $pcp_zoneinfo 
+
+archive_first="-a archives/pcp-zoneinfo -z -O +1"
+
+echo && echo pcp-zoneinfo output : Display output 
+pcp $archive_first zoneinfo
+
+echo && echo pcp-zoneinfo output : Display output when given specified number of samples
+pcp $archive_first zoneinfo -s 2
+
+status=0
+exit