1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
Description: Modify test fixture paths
The Debian packging process executes Go tests in a subdirectory
which is not handled correctly. The path to each test fixture
file has been updated to reflect this.
Author: Tim Potter <tpot@hpe.com>
Forwarded: no
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Index: golang-bindata/convert_test.go
===================================================================
--- golang-bindata.orig/convert_test.go
+++ golang-bindata/convert_test.go
@@ -19,7 +19,7 @@ func TestFindFiles(t *testing.T) {
var toc []Asset
var knownFuncs = make(map[string]int)
var visitedPaths = make(map[string]bool)
- err := findFiles("testdata/dupname", "testdata/dupname", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+ err := findFiles("../../../../../testdata/dupname", "../../../../../testdata/dupname", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
if err != nil {
t.Errorf("expected to be no error: %+v", err)
}
@@ -34,14 +34,14 @@ func TestFindFilesWithSymlinks(t *testin
var knownFuncs = make(map[string]int)
var visitedPaths = make(map[string]bool)
- err := findFiles("testdata/symlinkSrc", "testdata/symlinkSrc", true, &tocSrc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+ err := findFiles("../../../../../testdata/symlinkSrc", "../../../../../testdata/symlinkSrc", true, &tocSrc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
if err != nil {
t.Errorf("expected to be no error: %+v", err)
}
knownFuncs = make(map[string]int)
visitedPaths = make(map[string]bool)
- err = findFiles("testdata/symlinkParent", "testdata/symlinkParent", true, &tocTarget, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+ err = findFiles("../../../../../testdata/symlinkParent", "../../../../../testdata/symlinkParent", true, &tocTarget, []*regexp.Regexp{}, knownFuncs, visitedPaths)
if err != nil {
t.Errorf("expected to be no error: %+v", err)
}
@@ -64,7 +64,7 @@ func TestFindFilesWithRecursiveSymlinks(
var knownFuncs = make(map[string]int)
var visitedPaths = make(map[string]bool)
- err := findFiles("testdata/symlinkRecursiveParent", "testdata/symlinkRecursiveParent", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+ err := findFiles("../../../../../testdata/symlinkRecursiveParent", "../../../../../testdata/symlinkRecursiveParent", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
if err != nil {
t.Errorf("expected to be no error: %+v", err)
}
@@ -79,7 +79,7 @@ func TestFindFilesWithSymlinkedFile(t *t
var knownFuncs = make(map[string]int)
var visitedPaths = make(map[string]bool)
- err := findFiles("testdata/symlinkFile", "testdata/symlinkFile", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
+ err := findFiles("../../../../../testdata/symlinkFile", "../../../../../testdata/symlinkFile", true, &toc, []*regexp.Regexp{}, knownFuncs, visitedPaths)
if err != nil {
t.Errorf("expected to be no error: %+v", err)
}
|
