From e79b0b42f074ced1814010974ffad47d0d3d24d0 Mon Sep 17 00:00:00 2001 From: Darren Stahl Date: Tue, 13 Sep 2016 17:43:27 -0700 Subject: [PATCH] Windows: Enable more build tests Signed-off-by: Darren Stahl --- integration-cli/docker_cli_build_test.go | 30 +++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index 28c9dc09e2..ba8d7672ce 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -813,9 +813,7 @@ RUN [ $(cat "/test dir/test_file6") = 'test6' ]`, } func (s *DockerSuite) TestBuildCopyFileWithWhitespace(c *check.C) { - testRequires(c, DaemonIsLinux) // Not currently passing on Windows - name := "testcopyfilewithwhitespace" - ctx, err := fakeContext(`FROM busybox + dockerfile := `FROM busybox RUN mkdir "/test dir" RUN mkdir "/test_dir" COPY [ "test file1", "/test_file1" ] @@ -829,7 +827,28 @@ RUN [ $(cat "/test file2") = 'test2' ] RUN [ $(cat "/test file3") = 'test3' ] RUN [ $(cat "/test_dir/test_file4") = 'test4' ] RUN [ $(cat "/test dir/test_file5") = 'test5' ] -RUN [ $(cat "/test dir/test_file6") = 'test6' ]`, +RUN [ $(cat "/test dir/test_file6") = 'test6' ]` + + if daemonPlatform == "windows" { + dockerfile = `FROM windowsservercore +RUN mkdir "C:/test dir" +RUN mkdir "C:/test_dir" +COPY [ "test file1", "/test_file1" ] +COPY [ "test_file2", "/test file2" ] +COPY [ "test file3", "/test file3" ] +COPY [ "test dir/test_file4", "/test_dir/test_file4" ] +COPY [ "test_dir/test_file5", "/test dir/test_file5" ] +COPY [ "test dir/test_file6", "/test dir/test_file6" ] +RUN find "test1" "C:/test_file1" +RUN find "test2" "C:/test file2" +RUN find "test3" "C:/test file3" +RUN find "test4" "C:/test_dir/test_file4" +RUN find "test5" "C:/test dir/test_file5" +RUN find "test6" "C:/test dir/test_file6"` + } + + name := "testcopyfilewithwhitespace" + ctx, err := fakeContext(dockerfile, map[string]string{ "test file1": "test1", "test_file2": "test2", @@ -2022,7 +2041,6 @@ func (s *DockerSuite) TestBuildPATH(c *check.C) { } func (s *DockerSuite) TestBuildContextCleanup(c *check.C) { - testRequires(c, DaemonIsLinux) testRequires(c, SameHostDaemon) name := "testbuildcontextcleanup" @@ -2031,7 +2049,7 @@ func (s *DockerSuite) TestBuildContextCleanup(c *check.C) { c.Fatalf("failed to list contents of tmp dir: %s", err) } _, err = buildImage(name, - `FROM scratch + `FROM `+minimalBaseImage()+` ENTRYPOINT ["/bin/echo"]`, true) if err != nil {