Merge pull request #10 from garlick/rel_23

build system enhancements and prep for 1.2.23 release

AUTHORS

@@ -5,3 +5,4 @@ Mark Grondona
 Tim Randles
 Jim Silva
 Cameron Harr
+Phil Regier

Makefile

@@ -0,0 +1,11 @@
+all:
+	@echo Nothing to do
+
+clean:
+	rm -f nodediag-*.tar.gz
+
+dist:
+	@scripts/mkdist
+
+check:
+	cd test && ../scripts/runtests

NEWS

@@ -1,3 +1,16 @@
+=========================================================================
+Release Notes for nodediag version 1.2.23                     06 Dec 2018
+=========================================================================
+
+* Allow alternate interface dev name to be specified for network.t test
+  (Phil Regier)
+
+* Add 'make dist' and 'make check' targets.
+
+* Ensure failing tests result in nonzero exit code.
+
+* Update Dell T5500 PCI vendor name for Broadcom.
+
 =========================================================================
 Release Notes for nodediag version 1.2.22                     30 May 2018
 =========================================================================

README.md

@@ -1,5 +1,5 @@
 Nodediag provides an extensible
-[TAP](http://testanything.org/wiki/index.php/Main_Page TAP)
+[TAP](http://testanything.org/wiki/index.php/Main_Page)
 framework for executing node diagnostic checks at system startup.
 
 Tests installed in `/etc/nodediag.d/` are run in parallel by the `nodediag`

nodediag.spec

@@ -1,7 +1,7 @@
 Name: nodediag
-Version:
-Release:
-Source:
+Version: 1.2.23
+Release: 1
+Source: %{name}-%{version}.tar.gz
 License: GPL
 Summary: Tests to verify hardware
 Group: Applications/Devel

scripts/mkdist

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if test $# -gt 1; then
+    echo "Usage: mkdist [git-tag]" >&2
+    exit 1
+fi
+VERSION=$1
+if test -z "$VERSION"; then
+    VERSION=$(git describe --always | awk '/.*/ {printf "%s",$1; exit}')
+fi
+
+echo "Creating ${VERSION}.tar.gz"
+
+git archive --format=tar --prefix=nodediag-${VERSION}/ ${VERSION} \
+		| gzip >nodediag-${VERSION}.tar.gz

scripts/runtests

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+if ! test -d ../diags; then
+	echo Must be run within test directory >&2
+	exit 1
+fi
+
+export NODEDIAGDIR=../diags
+
+fail_count=0
+
+for file in */dmidecode; do
+	platform=$(basename $(dirname $file))
+	echo $platform: running dmi.t on cached config and dmidecode dump file
+	export DMIDECODE_DUMP_FILE=$file
+	export NODEDIAGCONF=$(dirname $file)/dmi.conf
+	if $NODEDIAGDIR/dmi.t | grep 'not ok'; then
+		fail_count=$(($fail_count+1))
+	fi
+	unset NODEDIAGCONF
+done
+
+for file in */lspci; do
+	platform=$(basename $(dirname $file))
+	echo $platform: running pci.t on cached config and lspci dump file
+	export LSPCI_DUMP_FILE=$file
+	export NODEDIAGCONF=$(dirname $file)/pci*.conf
+	if $NODEDIAGDIR/pci.t | grep 'not ok'; then
+		fail_count=$(($fail_count+1))
+	fi
+	unset NODEDIAGCONF
+done
+
+echo Failed $fail_count tests >&2
+test $fail_count -eq 0 || exit 1

test/T5500/pci.conf

@@ -10,7 +10,7 @@ DIAG_PCI_SPEED[1]="2.5GT/s"
 DIAG_PCI_WIDTH[1]="x16"
 #
 DIAG_PCI_SLOT[2]="06:00.0"
-DIAG_PCI_NAME[2]="Broadcom Corporation NetXtreme BCM5761 Gigabit Ethernet PCIe (rev 10)"
+DIAG_PCI_NAME[2]="Broadcom Limited NetXtreme BCM5761 Gigabit Ethernet PCIe (rev 10)"
 DIAG_PCI_SPEED[2]="2.5GT/s"
 DIAG_PCI_WIDTH[2]="x1"
 #