From 003641fcb2eb1a3ca636deaacc4d78f5fd74623a Mon Sep 17 00:00:00 2001 From: Pierre Boutillier Date: Mon, 24 Feb 2020 15:33:23 +0100 Subject: [PATCH] atd*.2.1.0: restrict tests to their package --- .../files/restrict-tests.diff | 1 + .../atdgen-codec-runtime.2.1.0/opam | 4 ++ .../files/restrict-tests.diff | 1 + .../atdgen-runtime/atdgen-runtime.2.1.0/opam | 4 ++ .../atdgen.2.1.0/files/restrict-tests.diff | 41 +++++++++++++++++++ packages/atdgen/atdgen.2.1.0/opam | 4 ++ .../atds/atds.2.1.0/files/restrict-tests.diff | 1 + packages/atds/atds.2.1.0/opam | 4 ++ 8 files changed, 60 insertions(+) create mode 120000 packages/atdgen-codec-runtime/atdgen-codec-runtime.2.1.0/files/restrict-tests.diff create mode 120000 packages/atdgen-runtime/atdgen-runtime.2.1.0/files/restrict-tests.diff create mode 100644 packages/atdgen/atdgen.2.1.0/files/restrict-tests.diff create mode 120000 packages/atds/atds.2.1.0/files/restrict-tests.diff diff --git a/packages/atdgen-codec-runtime/atdgen-codec-runtime.2.1.0/files/restrict-tests.diff b/packages/atdgen-codec-runtime/atdgen-codec-runtime.2.1.0/files/restrict-tests.diff new file mode 120000 index 000000000000..cbcafa9d0c52 --- /dev/null +++ b/packages/atdgen-codec-runtime/atdgen-codec-runtime.2.1.0/files/restrict-tests.diff @@ -0,0 +1 @@ +../../../atdgen/atdgen.2.1.0/files/restrict-tests.diff \ No newline at end of file diff --git a/packages/atdgen-codec-runtime/atdgen-codec-runtime.2.1.0/opam b/packages/atdgen-codec-runtime/atdgen-codec-runtime.2.1.0/opam index 78cc583972d2..34603d0bb33e 100644 --- a/packages/atdgen-codec-runtime/atdgen-codec-runtime.2.1.0/opam +++ b/packages/atdgen-codec-runtime/atdgen-codec-runtime.2.1.0/opam @@ -27,6 +27,7 @@ depends: [ "dune" {>= "1.11"} "ocaml" {>= "4.02"} ] +patches: ["restrict-tests.diff"] build: [ ["dune" "subst"] {pinned} [ @@ -42,6 +43,9 @@ build: [ ] ] dev-repo: "git+https://github.com/ahrefs/atd.git" +extra-files: [ + [ "restrict-tests.diff" "sha256=f1d4635c02155ac8eac7444b92a70a6b04195afdd6c13ddfccaac82c26aac8d5"] +] url { src: "https://github.com/ahrefs/atd/releases/download/2.1.0/atd-2.1.0.tbz" checksum: [ diff --git a/packages/atdgen-runtime/atdgen-runtime.2.1.0/files/restrict-tests.diff b/packages/atdgen-runtime/atdgen-runtime.2.1.0/files/restrict-tests.diff new file mode 120000 index 000000000000..cbcafa9d0c52 --- /dev/null +++ b/packages/atdgen-runtime/atdgen-runtime.2.1.0/files/restrict-tests.diff @@ -0,0 +1 @@ +../../../atdgen/atdgen.2.1.0/files/restrict-tests.diff \ No newline at end of file diff --git a/packages/atdgen-runtime/atdgen-runtime.2.1.0/opam b/packages/atdgen-runtime/atdgen-runtime.2.1.0/opam index 442384fff2e3..c902a3666b62 100644 --- a/packages/atdgen-runtime/atdgen-runtime.2.1.0/opam +++ b/packages/atdgen-runtime/atdgen-runtime.2.1.0/opam @@ -30,6 +30,7 @@ depends: [ "biniou" {>= "1.0.6"} "re" ] +patches: ["restrict-tests.diff"] build: [ ["dune" "subst"] {pinned} [ @@ -45,6 +46,9 @@ build: [ ] ] dev-repo: "git+https://github.com/ahrefs/atd.git" +extra-files: [ + [ "restrict-tests.diff" "sha256=f1d4635c02155ac8eac7444b92a70a6b04195afdd6c13ddfccaac82c26aac8d5"] +] url { src: "https://github.com/ahrefs/atd/releases/download/2.1.0/atd-2.1.0.tbz" checksum: [ diff --git a/packages/atdgen/atdgen.2.1.0/files/restrict-tests.diff b/packages/atdgen/atdgen.2.1.0/files/restrict-tests.diff new file mode 100644 index 000000000000..7c016ce1bd29 --- /dev/null +++ b/packages/atdgen/atdgen.2.1.0/files/restrict-tests.diff @@ -0,0 +1,41 @@ +diff -u -r atd-2.1.0/atdgen/test/bucklescript/dune fixed-atd-2.1.0/atdgen/test/bucklescript/dune +--- atd-2.1.0/atdgen/test/bucklescript/dune 2019-12-04 07:48:48.000000000 +0100 ++++ fixed-atd-2.1.0/atdgen/test/bucklescript/dune 2020-02-24 16:01:40.682693115 +0100 +@@ -32,16 +32,20 @@ + + (alias + (name runtest) ++ (package atdgen) + (action (diff bucklespec_bs.expected.ml bucklespec_bs.ml))) + + (alias + (name runtest) ++ (package atdgen) + (action (diff bucklespec_bs.expected.mli bucklespec_bs.mli))) + + (alias + (name runtest) ++ (package atdgen) + (action (diff bucklespec_j.expected.ml bucklespec_j.ml))) + + (alias + (name runtest) ++ (package atdgen) + (action (run ./bucklespec_roundtrip.exe))) +diff -u -r atd-2.1.0/atdgen/test/spec_js/dune fixed-atd-2.1.0/atdgen/test/spec_js/dune +--- atd-2.1.0/atdgen/test/spec_js/dune 2019-12-04 07:48:48.000000000 +0100 ++++ fixed-atd-2.1.0/atdgen/test/spec_js/dune 2020-02-24 15:16:05.827796462 +0100 +@@ -34,6 +34,7 @@ + + (alias + (name runtest) ++ (package atdgen) + (action (diff spec_j.expected.json spec_j.json))) + + (rule +@@ -42,4 +43,5 @@ + + (alias + (name runtest) ++ (package atdgen) + (action (diff spec_bs.expected.json spec_bs.json))) diff --git a/packages/atdgen/atdgen.2.1.0/opam b/packages/atdgen/atdgen.2.1.0/opam index 8ea9504f72d1..4fb4c50153dd 100644 --- a/packages/atdgen/atdgen.2.1.0/opam +++ b/packages/atdgen/atdgen.2.1.0/opam @@ -40,6 +40,7 @@ depends: [ "yojson" {>= "1.7.0"} "atdgen-codec-runtime" {with-test} ] +patches: ["restrict-tests.diff"] build: [ ["dune" "subst"] {pinned} [ @@ -55,6 +56,9 @@ build: [ ] ] dev-repo: "git+https://github.com/ahrefs/atd.git" +extra-files: [ + [ "restrict-tests.diff" "sha256=f1d4635c02155ac8eac7444b92a70a6b04195afdd6c13ddfccaac82c26aac8d5"] +] url { src: "https://github.com/ahrefs/atd/releases/download/2.1.0/atd-2.1.0.tbz" checksum: [ diff --git a/packages/atds/atds.2.1.0/files/restrict-tests.diff b/packages/atds/atds.2.1.0/files/restrict-tests.diff new file mode 120000 index 000000000000..cbcafa9d0c52 --- /dev/null +++ b/packages/atds/atds.2.1.0/files/restrict-tests.diff @@ -0,0 +1 @@ +../../../atdgen/atdgen.2.1.0/files/restrict-tests.diff \ No newline at end of file diff --git a/packages/atds/atds.2.1.0/opam b/packages/atds/atds.2.1.0/opam index 158ba1c11e14..61dd3c27456d 100644 --- a/packages/atds/atds.2.1.0/opam +++ b/packages/atds/atds.2.1.0/opam @@ -27,6 +27,7 @@ depends: [ "atd" {>= "2.0.0"} "re" ] +patches: ["restrict-tests.diff"] build: [ ["dune" "subst"] {pinned} [ @@ -42,6 +43,9 @@ build: [ ] ] dev-repo: "git+https://github.com/ahrefs/atd.git" +extra-files: [ + [ "restrict-tests.diff" "sha256=f1d4635c02155ac8eac7444b92a70a6b04195afdd6c13ddfccaac82c26aac8d5"] +] url { src: "https://github.com/ahrefs/atd/releases/download/2.1.0/atd-2.1.0.tbz" checksum: [