[lxc-devel] [lxd/master] Fix static-analysis target

[albertodonato on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 346 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170530/7a2e27ce/attachment.bin>
-------------- next part --------------
From a85272d89a319484feb78d8a1d3296dabec4c7d3 Mon Sep 17 00:00:00 2001
From: Alberto Donato <alberto.donato at canonical.com>
Date: Tue, 30 May 2017 10:47:11 +0200
Subject: [PATCH] Fix static-analysis target.

---
 Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4bc77ce90..e318a637d 100644
--- a/Makefile
+++ b/Makefile
@@ -57,25 +57,25 @@ gccgo:
 dist:
 	# Cleanup
 	rm -Rf $(ARCHIVE).gz
-	
+
 	# Create build dir
 	$(eval TMP := $(shell mktemp -d))
 	git archive --prefix=lxd-$(VERSION)/ HEAD | tar -x -C $(TMP)
 	mkdir -p $(TMP)/dist/src/github.com/lxc
 	ln -s ../../../../lxd-$(VERSION) $(TMP)/dist/src/github.com/lxc/lxd
-	
+
 	# Download dependencies
 	cd $(TMP)/lxd-$(VERSION) && GOPATH=$(TMP)/dist go get -t -v -d ./...
-	
+
 	# Workaround for gorilla/mux on Go < 1.7
 	cd $(TMP)/lxd-$(VERSION) && GOPATH=$(TMP)/dist go get -v -d github.com/gorilla/context
-	
+
 	# Assemble tarball
 	rm $(TMP)/dist/src/github.com/lxc/lxd
 	ln -s ../../../../ $(TMP)/dist/src/github.com/lxc/lxd
 	mv $(TMP)/dist $(TMP)/lxd-$(VERSION)/
 	tar --exclude-vcs -C $(TMP) -zcf $(ARCHIVE).gz lxd-$(VERSION)/
-	
+
 	# Cleanup
 	rm -Rf $(TMP)
 
@@ -101,7 +101,7 @@ update-pot:
 build-mo: $(MOFILES)
 
 static-analysis:
-	/bin/bash -x -c ". test/static_analysis.sh; static_analysis"
+	(cd test;  /bin/bash -x -c ". suites/static_analysis.sh; test_static_analysis")
 
 tags: *.go lxd/*.go shared/*.go lxc/*.go
 	find . | grep \.go | grep -v git | grep -v .swp | grep -v vagrant | xargs gotags > tags