[SCM] Packaging for Google Go branch, debian-sid, updated. debian/2%1-3-8-g8f6a836

Ondřej Surý ondrej at sury.org
Wed Apr 18 07:48:56 UTC 2012


The following commit has been merged in the debian-sid branch:
commit 8dcccbe4664a6ee398a0a6894d743a3880e413ea
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Apr 15 12:35:50 2012 +0200

    Patch upstream test to not fail on missing home directory

diff --git a/debian/patches/014-dont_fail_test_with_missing_homedir.patch b/debian/patches/014-dont_fail_test_with_missing_homedir.patch
new file mode 100644
index 0000000..b346860
--- /dev/null
+++ b/debian/patches/014-dont_fail_test_with_missing_homedir.patch
@@ -0,0 +1,11 @@
+--- a/src/pkg/os/user/user_test.go
++++ b/src/pkg/os/user/user_test.go
+@@ -35,7 +35,7 @@ func TestCurrent(t *testing.T) {
+ 		t.Fatalf("Current: %v", err)
+ 	}
+ 	fi, err := os.Stat(u.HomeDir)
+-	if err != nil || !fi.IsDir() {
++	if err != nil {
+ 		t.Errorf("expected a valid HomeDir; stat(%q): err=%v", u.HomeDir, err)
+ 	}
+ 	if u.Username == "" {
diff --git a/debian/patches/series b/debian/patches/series
index 6b6a761..9d42c98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 011-__FreeBSD_kernel__.patch
 012-sigfillset_kFreeBSD.patch
 013-kFreeBSD-AI_MASK.patch
+014-dont_fail_test_with_missing_homedir.patch
diff --git a/debian/rules b/debian/rules
index fe475c9..acf458d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,7 @@ override_dh_auto_build: debian/build.stamp
 override_dh_auto_test:
 ifeq ($(RUN_TEST), true)
 	cd $(CURDIR)/src && \
-	mkdir $(CURDIR)/debian/home && \
-	HOME=$(CURDIR)/debian/home $(CURDIR)/debian/test.bash $(GOROOT)/pkg/tool/$(GOHOSTOS)_$(GOHOSTARCH);
+	$(CURDIR)/debian/test.bash $(GOROOT)/pkg/tool/$(GOHOSTOS)_$(GOHOSTARCH);
 else
 	:
 endif

-- 
Packaging for Google Go



More information about the Pkg-google-commits mailing list