Fix tests issues after sync with upstream

Author: rkoliada-cl

Makefile

@@ -117,7 +117,7 @@ update_fixtures:
 .PHONY: tools
 tools:
 @rm ./tools/tools >/dev/null 2>&1 || true
-@$(GO) build -o tools ./tools/...
+@$(GO) build -o tools/tools ./tools/...
 
 .PHONY: test-e2e
 test-e2e: build collector/fixtures/sys/.unpacked collector/fixtures/udev/.unpacked tools

end-to-end-test.sh

@@ -3,7 +3,7 @@
 set -euf -o pipefail
 
 # Allow setting GOHOSTOS for debugging purposes.
-GOHOSTOS=${GOHOSTOS:-$(go env GOHOSTOS)}
+GOHOSTOS=${GOHOSTOS:-$(go env GOHOSTOS 2>/dev/null || uname -s | tr '[:upper:]' '[:lower:]')}
 
 # Allow setting arch for debugging purposes.
 arch=${arch:-$(uname -m)}

node_exporter.spec

@@ -47,6 +47,7 @@ export PATH=$PATH:%{_tmppath}/go/bin
 export GOROOT=%{_tmppath}/go
 export GOPATH=%{_tmppath}
 make build
+make tools
 make test
 # run cross-testing
 %ifarch x86_64 amd64 ia32e
@@ -68,6 +69,11 @@ mkdir -p $RPM_BUILD_ROOT/opt/node_exporter_tests/collector
 cp -r collector/fixtures $RPM_BUILD_ROOT/opt/node_exporter_tests/collector/
 install -D -m 755 end-to-end-test.sh $RPM_BUILD_ROOT/opt/node_exporter_tests/end-to-end-test.sh
 install -D -m 755 node_exporter $RPM_BUILD_ROOT/opt/node_exporter_tests/node_exporter
+mkdir -p $RPM_BUILD_ROOT/opt/node_exporter_tests/tools
+install -D -m 755 tools/tools $RPM_BUILD_ROOT/opt/node_exporter_tests/tools/tools
+
+# remove broken symlinks
+find $RPM_BUILD_ROOT/opt/node_exporter_tests/collector/fixtures -xtype l -delete
 
 # write package version to file
 if [[ ! -d "$RPM_BUILD_ROOT%{cl_dir}" ]]; then