From 8bd262134a6c8301264127c5c7a99bbbb79cab91 Mon Sep 17 00:00:00 2001 From: Anton Harniakou Date: Fri, 1 Dec 2017 21:11:01 +0300 Subject: [PATCH] Add fixtures for resolver tests --- resolver/fixtures/bar | 1 + resolver/fixtures/baz/stuff.mk | 1 + resolver/fixtures/foo | 1 - resolver/fixtures/foo.mk | 1 + resolver/resolver_test.go | 8 ++++---- 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 resolver/fixtures/bar create mode 100644 resolver/fixtures/baz/stuff.mk delete mode 160000 resolver/fixtures/foo create mode 100644 resolver/fixtures/foo.mk diff --git a/resolver/fixtures/bar b/resolver/fixtures/bar new file mode 100644 index 0000000..aa8eb0d --- /dev/null +++ b/resolver/fixtures/bar @@ -0,0 +1 @@ +$(info bar) diff --git a/resolver/fixtures/baz/stuff.mk b/resolver/fixtures/baz/stuff.mk new file mode 100644 index 0000000..1963ada --- /dev/null +++ b/resolver/fixtures/baz/stuff.mk @@ -0,0 +1 @@ +$(info baz) diff --git a/resolver/fixtures/foo b/resolver/fixtures/foo deleted file mode 160000 index a317ff5..0000000 --- a/resolver/fixtures/foo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a317ff56f686e60c6ac69f8dcf8be834f513620d diff --git a/resolver/fixtures/foo.mk b/resolver/fixtures/foo.mk new file mode 100644 index 0000000..bc1933a --- /dev/null +++ b/resolver/fixtures/foo.mk @@ -0,0 +1 @@ +$(info foo) diff --git a/resolver/resolver_test.go b/resolver/resolver_test.go index bbeb097..1ef533d 100644 --- a/resolver/resolver_test.go +++ b/resolver/resolver_test.go @@ -46,9 +46,9 @@ func TestLocal(t *testing.T) { Path string Content string }{ - {"fixtures/foo/bar", "$(info bar)\n"}, - {"fixtures/foo/foo.mk", "$(info foo)\n"}, - {"fixtures/foo/baz/stuff.mk", "$(info baz)\n"}, + {"fixtures/bar", "$(info bar)\n"}, + {"fixtures/foo.mk", "$(info foo)\n"}, + {"fixtures/baz/stuff.mk", "$(info baz)\n"}, } for _, c := range cases { @@ -78,7 +78,7 @@ func TestUniversal(t *testing.T) { Path string Content string }{ - {"fixtures/foo/bar", "$(info bar)\n"}, + {"fixtures/bar", "$(info bar)\n"}, {"github.com/tj/foo/bar", "$(info bar)\n"}, }