Last-Update: 2016-03-02
Forwarded: not-needed
Origin: upstream, https://github.com/jacobsa/ogletest/commit/bfb9790637dd428ef4d70880e889e10ef38c0823
Bug-Upstream: https://github.com/jacobsa/ogletest/issues/28
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=803320
Author: Aaron Jacobs <jacobsa@google.com>
Description: Test on a variety of Go versions.

--- a/integration_test.go
+++ b/integration_test.go
@@ -120,14 +120,13 @@
 	// Replace references to the last component of the test package name, which
 	// contains a unique number.
 	o = []byte(strings.Replace(string(o), path.Base(testPkg), "somepkg", -1))
 
-	// Replace things that look like line numbers and process counters in stack
-	// traces.
-	stackFrameRe := regexp.MustCompile(`\t\S+\.(c|go):\d+`)
+	// Replace specific paths and line numbers in stack traces.
+	stackFrameRe := regexp.MustCompile(`\t\S+\.(c|go|s):\d+`)
 	o = stackFrameRe.ReplaceAll(o, []byte("\tsome_file.txt:0"))
 
-	// Replace full paths in failure messages with fake paths.
+	// Don't include directories in ogletest-generated failure messages.
 	pathRe := regexp.MustCompile(`/\S+/(\w+\.(?:go|s):\d+)`)
 	o = pathRe.ReplaceAll(o, []byte("/some/path/$1"))
 
 	// Replace unstable timings in gotest fail messages.
--- a/test_cases/golden.panicking_test
+++ b/test_cases/golden.panicking_test
@@ -5,10 +5,10 @@
 panic: Panic in ExplicitPanic
 
 github.com/jacobsa/ogletest/somepkg_test.(*PanickingTest).ExplicitPanic
 	some_file.txt:0
-runtime.call16
-	/some/path/asm_amd64.s:401
+runtime.call32
+	some_file.txt:0
 reflect.Value.call
 	some_file.txt:0
 reflect.Value.Call
 	some_file.txt:0
@@ -23,10 +23,10 @@
 github.com/jacobsa/ogletest/somepkg_test.someFuncThatPanics
 	some_file.txt:0
 github.com/jacobsa/ogletest/somepkg_test.(*PanickingTest).ExplicitPanicInHelperFunction
 	some_file.txt:0
-runtime.call16
-	/some/path/asm_amd64.s:401
+runtime.call32
+	some_file.txt:0
 reflect.Value.call
 	some_file.txt:0
 reflect.Value.Call
 	some_file.txt:0
@@ -39,10 +39,10 @@
 panic: runtime error: invalid memory address or nil pointer dereference
 
 github.com/jacobsa/ogletest/somepkg_test.(*PanickingTest).NilPointerDerefence
 	some_file.txt:0
-runtime.call16
-	/some/path/asm_amd64.s:401
+runtime.call32
+	some_file.txt:0
 reflect.Value.call
 	some_file.txt:0
 reflect.Value.Call
 	some_file.txt:0
@@ -61,11 +61,11 @@
 panic: Panic in SetUp
 
 github.com/jacobsa/ogletest/somepkg_test.(*SetUpPanicTest).SetUp
 	some_file.txt:0
-github.com/jacobsa/ogletest.func·003
+github.com/jacobsa/ogletest.RegisterTestSuite.func3
 	some_file.txt:0
-github.com/jacobsa/ogletest.func·007
+github.com/jacobsa/ogletest.runTestFunction.func2
 	some_file.txt:0
 
 
 [  FAILED  ] SetUpPanicTest.SomeTestCase
@@ -77,9 +77,9 @@
 panic: Panic in TearDown
 
 github.com/jacobsa/ogletest/somepkg_test.(*TearDownPanicTest).TearDown
 	some_file.txt:0
-github.com/jacobsa/ogletest.func·005
+github.com/jacobsa/ogletest.RegisterTestSuite.func5
 	some_file.txt:0
 
 
 [  FAILED  ] TearDownPanicTest.SomeTestCase