From cc3d041c263ef88d2d301d06eb17031cfabfc971 Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Mon, 25 Jan 2016 08:21:57 -0800 Subject: DSL method "apply" to specify patch files The "apply" DSL method can be called from patch-do blocks to specify the paths within an archive of the desired patch files, which will be applied in the order in which they were supplied to the "apply" calls. If "apply" isn't used, raise an error whenever the extracted directory doesn't contain exactly one file. The "apply" method can be called zero or more times within a patch-do block with the following syntaxes supported: apply "single_apply" apply "multiple_apply_1", "multiple_apply_2" apply [array_of_apply] If apply must be used, a single call using the second syntax above is usually best practice. Each apply leaf should be the relative path to a specific patch file in the extracted directory. For example, if extracting this-v123-patches.tar.gz gives you this-123 this-123/.DS_Store this-123/LICENSE.txt this-123/patches this-123/patches/A.diff this-123/patches/B.diff this-123/patches/C.diff this-123/README.txt and you want to apply only B.diff and C.diff, then you need to use "patches/B.diff" and "patches/C.diff" for the lowest-level apply leaves. The code was provided by Xu Cheng. Any mistakes are mine. --- Library/Homebrew/test/lib/config.rb | 3 + Library/Homebrew/test/patches/noop-c.diff | 9 ++ .../test/tarballs/testball-0.1-patches.tgz | Bin 0 -> 368 bytes Library/Homebrew/test/test_patch.rb | 25 +++++ Library/Homebrew/test/test_patching.rb | 124 ++++++++++++++++++++- 5 files changed, 155 insertions(+), 6 deletions(-) create mode 100644 Library/Homebrew/test/patches/noop-c.diff create mode 100644 Library/Homebrew/test/tarballs/testball-0.1-patches.tgz (limited to 'Library/Homebrew/test') diff --git a/Library/Homebrew/test/lib/config.rb b/Library/Homebrew/test/lib/config.rb index 3f72a5764..39c4ae27f 100644 --- a/Library/Homebrew/test/lib/config.rb +++ b/Library/Homebrew/test/lib/config.rb @@ -21,3 +21,6 @@ HOMEBREW_LOGS = HOMEBREW_PREFIX.parent+"logs" TESTBALL_SHA1 = "be478fd8a80fe7f29196d6400326ac91dad68c37" TESTBALL_SHA256 = "91e3f7930c98d7ccfb288e115ed52d06b0e5bc16fec7dce8bdda86530027067b" +TESTBALL_PATCHES_SHA256 = "799c2d551ac5c3a5759bea7796631a7906a6a24435b52261a317133a0bfb34d9" +PATCH_A_SHA256 = "83404f4936d3257e65f176c4ffb5a5b8d6edd644a21c8d8dcc73e22a6d28fcfa" +PATCH_B_SHA256 = "57958271bb802a59452d0816e0670d16c8b70bdf6530bcf6f78726489ad89b90" diff --git a/Library/Homebrew/test/patches/noop-c.diff b/Library/Homebrew/test/patches/noop-c.diff new file mode 100644 index 000000000..6d0de5b7b --- /dev/null +++ b/Library/Homebrew/test/patches/noop-c.diff @@ -0,0 +1,9 @@ +diff --git a/libexec/NOOP b/libexec/NOOP +index e08d8f4..3ebfb9d 100755 +--- a/libexec/NOOP ++++ b/libexec/NOOP +@@ -1,2 +1,2 @@ + #!/bin/bash +-echo ABCD +\ No newline at end of file ++echo 1234 diff --git a/Library/Homebrew/test/tarballs/testball-0.1-patches.tgz b/Library/Homebrew/test/tarballs/testball-0.1-patches.tgz new file mode 100644 index 000000000..4b43f535e Binary files /dev/null and b/Library/Homebrew/test/tarballs/testball-0.1-patches.tgz differ diff --git a/Library/Homebrew/test/test_patch.rb b/Library/Homebrew/test/test_patch.rb index 0d0033ee1..3c6743ded 100644 --- a/Library/Homebrew/test/test_patch.rb +++ b/Library/Homebrew/test/test_patch.rb @@ -128,3 +128,28 @@ class ExternalPatchTests < Homebrew::TestCase assert_equal "/tmp/foo.tar.gz", @p.cached_download end end + +class ApplyPatchTests < Homebrew::TestCase + def test_empty_patch_files + patch = Patch.create(:p2, nil) + resource = patch.resource + patch_files = patch.patch_files + assert_kind_of Resource::Patch, resource + assert_equal patch_files, resource.patch_files + assert_equal patch_files, [] + end + + def test_resource_patch_apply_method + patch = Patch.create(:p2, nil) + resource = patch.resource + patch_files = patch.patch_files + resource.apply("patch1.diff") + assert_equal patch_files, ["patch1.diff"] + resource.apply("patch2.diff", "patch3.diff") + assert_equal patch_files, ["patch1.diff", "patch2.diff", "patch3.diff"] + resource.apply(["patch4.diff", "patch5.diff"]) + assert_equal patch_files.count, 5 + resource.apply("patch4.diff", ["patch5.diff", "patch6.diff"], "patch7.diff") + assert_equal patch_files.count, 7 + end +end diff --git a/Library/Homebrew/test/test_patching.rb b/Library/Homebrew/test/test_patching.rb index 3c307a43f..8a18125ef 100644 --- a/Library/Homebrew/test/test_patching.rb +++ b/Library/Homebrew/test/test_patching.rb @@ -2,15 +2,20 @@ require "testing_env" require "formula" class PatchingTests < Homebrew::TestCase + TESTBALL_URL = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz" + TESTBALL_PATCHES_URL = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1-patches.tgz" PATCH_URL_A = "file://#{TEST_DIRECTORY}/patches/noop-a.diff" PATCH_URL_B = "file://#{TEST_DIRECTORY}/patches/noop-b.diff" PATCH_A_CONTENTS = File.read "#{TEST_DIRECTORY}/patches/noop-a.diff" PATCH_B_CONTENTS = File.read "#{TEST_DIRECTORY}/patches/noop-b.diff" + APPLY_A = "noop-a.diff" + APPLY_B = "noop-b.diff" + APPLY_C = "noop-c.diff" def formula(*args, &block) super do - url "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz" - sha1 TESTBALL_SHA1 + url TESTBALL_URL + sha256 TESTBALL_SHA256 class_eval(&block) end end @@ -31,6 +36,28 @@ class PatchingTests < Homebrew::TestCase end end + def assert_sequentially_patched(formula) + shutup do + formula.brew do + formula.patch + s = File.read("libexec/NOOP") + refute_includes s, "NOOP", "libexec/NOOP was not patched as expected" + refute_includes s, "ABCD", "libexec/NOOP was not patched as expected" + assert_includes s, "1234", "libexec/NOOP was not patched as expected" + end + end + end + + def assert_missing_apply_fail(formula) + assert_raises(MissingApplyError) do + shutup do + formula.brew do + formula.patch + end + end + end + end + def test_single_patch assert_patched formula { def patches @@ -43,7 +70,27 @@ class PatchingTests < Homebrew::TestCase assert_patched formula { patch do url PATCH_URL_A - sha1 "fa8af2e803892e523fdedc6b758117c45e5749a2" + sha256 PATCH_A_SHA256 + end + } + end + + def test_single_patch_dsl_with_apply + assert_patched formula { + patch do + url TESTBALL_PATCHES_URL + sha256 TESTBALL_PATCHES_SHA256 + apply APPLY_A + end + } + end + + def test_single_patch_dsl_with_sequential_apply + assert_sequentially_patched formula { + patch do + url TESTBALL_PATCHES_URL + sha256 TESTBALL_PATCHES_SHA256 + apply APPLY_A, APPLY_C end } end @@ -52,7 +99,17 @@ class PatchingTests < Homebrew::TestCase assert_patched formula { patch :p1 do url PATCH_URL_A - sha1 "fa8af2e803892e523fdedc6b758117c45e5749a2" + sha256 PATCH_A_SHA256 + end + } + end + + def test_single_patch_dsl_with_strip_with_apply + assert_patched formula { + patch :p1 do + url TESTBALL_PATCHES_URL + sha256 TESTBALL_PATCHES_SHA256 + apply APPLY_A end } end @@ -63,7 +120,21 @@ class PatchingTests < Homebrew::TestCase formula do patch :p0 do url PATCH_URL_A - sha1 "fa8af2e803892e523fdedc6b758117c45e5749a2" + sha256 PATCH_A_SHA256 + end + end.brew(&:patch) + end + end + end + + def test_single_patch_dsl_with_incorrect_strip_with_apply + assert_raises(ErrorDuringExecution) do + shutup do + formula do + patch :p0 do + url TESTBALL_PATCHES_URL + sha256 TESTBALL_PATCHES_SHA256 + apply APPLY_A end end.brew(&:patch) end @@ -74,11 +145,21 @@ class PatchingTests < Homebrew::TestCase assert_patched formula { patch :p0 do url PATCH_URL_B - sha1 "3b54bd576f998ef6d6623705ee023b55062b9504" + sha256 PATCH_B_SHA256 end } end + def test_patch_p0_dsl_with_apply + assert_patched formula { + patch :p0 do + url TESTBALL_PATCHES_URL + sha256 TESTBALL_PATCHES_SHA256 + apply APPLY_B + end + } + end + def test_patch_p0 assert_patched formula { def patches @@ -126,6 +207,37 @@ class PatchingTests < Homebrew::TestCase end } end + + def test_single_patch_missing_apply_fail + assert_missing_apply_fail formula { + def patches + TESTBALL_PATCHES_URL + end + } + end + + def test_single_patch_dsl_missing_apply_fail + assert_missing_apply_fail formula { + patch do + url TESTBALL_PATCHES_URL + sha256 TESTBALL_PATCHES_SHA256 + end + } + end + + def test_single_patch_dsl_with_apply_enoent_fail + assert_raises(ErrorDuringExecution) do + shutup do + formula do + patch do + url TESTBALL_PATCHES_URL + sha256 TESTBALL_PATCHES_SHA256 + apply "patches/#{APPLY_A}" + end + end.brew(&:patch) + end + end + end end __END__ -- cgit v1.2.3