From 7125d6f515c7448275395899737b233f7eb4e71a Mon Sep 17 00:00:00 2001 From: Jim Teeuwen Date: Wed, 30 Oct 2013 02:19:24 +0100 Subject: [PATCH] Adds an extra testdata file to ensure that there are no name collisions in the generated code, when it comes to multiple assets with the same file name. This should all receive unique entries, using their directory paths to set them apart. --- testdata/in/test.asset | 1 + testdata/out/bindata_debug.go | 7 +++++++ testdata/out/bindata_release.go | 9 +++++++++ 3 files changed, 17 insertions(+) create mode 100644 testdata/in/test.asset diff --git a/testdata/in/test.asset b/testdata/in/test.asset new file mode 100644 index 0000000..ab2a2d9 --- /dev/null +++ b/testdata/in/test.asset @@ -0,0 +1 @@ +// sample file diff --git a/testdata/out/bindata_debug.go b/testdata/out/bindata_debug.go index c72c02b..8664292 100644 --- a/testdata/out/bindata_debug.go +++ b/testdata/out/bindata_debug.go @@ -35,6 +35,13 @@ func testdata_in_b_test_asset() []byte { ) } +func testdata_in_test_asset() []byte { + return bindata_read( + "/a/code/go/src/github.com/jteeuwen/go-bindata/testdata/in/test.asset", + "../testdata/in/test.asset", + ) +} + func testdata_in_a_test_asset() []byte { return bindata_read( "/a/code/go/src/github.com/jteeuwen/go-bindata/testdata/in/a/test.asset", diff --git a/testdata/out/bindata_release.go b/testdata/out/bindata_release.go index 8c11112..62af38f 100644 --- a/testdata/out/bindata_release.go +++ b/testdata/out/bindata_release.go @@ -28,6 +28,15 @@ func testdata_in_b_test_asset() []byte { ) } +var _testdata_in_test_asset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xd2\xd7\x57\x28\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\x8a\x82\x8c\x85\x0f\x00\x00\x00" + +func testdata_in_test_asset() []byte { + return bindata_read( + _testdata_in_test_asset, + "../testdata/in/test.asset", + ) +} + var _testdata_in_a_test_asset = "\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\x2a\x4e\xcc\x2d\xc8\x49\x55\x48\xcb\xcc\x49\xe5\x02\x04\x00\x00\xff\xff\xda\x3d\x49\xdd\x0c\x00\x00\x00" func testdata_in_a_test_asset() []byte {