updates for test binary compilation

thecodeteam · Feb 13, 2017 · 337190f · 337190f
1 parent d7ee6bd
commit 337190f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -1075,21 +1075,21 @@ test:
 	$(MAKE) -j parallel-test
 
 test-debug:
-	env LIBSTORAGE_DEBUG=true $(MAKE) test
+	LIBSTORAGE_DEBUG=true $(MAKE) test
 
 test-rbd:
-	env DRIVERS=rbd $(MAKE) deps
-	env DRIVERS=rbd $(MAKE) ./drivers/storage/rbd/tests/rbd.test
+	DRIVERS=rbd $(MAKE) deps
+	DRIVERS=rbd $(MAKE) ./drivers/storage/rbd/tests/rbd.test
 
 test-rbd-clean:
-	env DRIVERS=rbd $(MAKE) clean
+	DRIVERS=rbd $(MAKE) clean
 
 test-gcepd:
-	env DRIVERS=gcepd $(MAKE) deps
-	env DRIVERS=gcepd $(MAKE) ./drivers/storage/gcepd/tests/gcepd.test
+	DRIVERS=gcepd $(MAKE) deps
+	DRIVERS=gcepd $(MAKE) ./drivers/storage/gcepd/tests/gcepd.test
 
 test-gcepd-clean:
-	env DRIVERS=gcepd $(MAKE) clean
+	DRIVERS=gcepd $(MAKE) clean
 
 clean: $(GO_CLEAN)
 

diff --git a/drivers/storage/gcepd/tests/gce_test.go → drivers/storage/gcepd/tests/gcepd_test.go b/drivers/storage/gcepd/tests/gce_test.go → drivers/storage/gcepd/tests/gcepd_test.go
@@ -1,6 +1,6 @@
 // +build !libstorage_storage_driver libstorage_storage_driver_gcepd
 
-package gce
+package gcepd
 
 import (
 	"os"
@@ -132,7 +132,7 @@ func volumeCreate(
 func volumeRemove(t *testing.T, client types.Client, volumeID string) {
 	log.WithField("volumeID", volumeID).Info("removing volume")
 	err := client.API().VolumeRemove(
-		nil, gcepd.Name, volumeID)
+		nil, gcepd.Name, volumeID, false)
 	assert.NoError(t, err)
 	if err != nil {
 		t.Error("failed volumeRemove")