From aea6001baf0cd0fb20a607e37e4379bf644b28fd Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosby.michael@gmail.com>
Date: Tue, 19 Nov 2013 03:13:22 -0800
Subject: [PATCH] Check env var for setting driver in tests

---
 graphdriver/driver.go | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/graphdriver/driver.go b/graphdriver/driver.go
index 4359f10256..a6d075bfb7 100644
--- a/graphdriver/driver.go
+++ b/graphdriver/driver.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/dotcloud/docker/archive"
 	"github.com/dotcloud/docker/utils"
+	"os"
 	"path"
 )
 
@@ -66,9 +67,15 @@ func New(root string) (Driver, error) {
 	var driver Driver
 	var lastError error
 
-	if DefaultDriver != "" {
-		return GetDriver(DefaultDriver, root)
+	for _, name := range []string{
+		os.Getenv("DOCKER_DRIVER"),
+		DefaultDriver,
+	} {
+		if name != "" {
+			return GetDriver(name, root)
+		}
 	}
+
 	// Check for priority drivers first
 	for _, name := range priority {
 		driver, lastError = GetDriver(name, root)