simplify away ppx_let test which causes failures

ocsigen · Oct 25, 2024 · 1c4b63d · 1c4b63d
1 parent 15004d5
commit 1c4b63d
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 49 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -91,7 +91,7 @@ jobs:
 
       - run: opam install lwt_react lwt --deps-only --with-test
 
-      - run: opam install lwt_ppx lwt_ppx_let --deps-only --with-test
+      - run: opam install lwt_ppx --deps-only --with-test
         if: ${{ matrix.ppx == true }}
 
       - run: opam exec -- dune build --only-packages lwt_react,lwt
@@ -104,9 +104,6 @@ jobs:
       - run: opam exec -- dune runtest --only-packages lwt_ppx
         if: ${{ matrix.ppx == true }}
 
-      - run: opam exec -- make ppx_let-test
-        if: ${{ matrix.ppx == true }}
-
   lint-opam:
     runs-on: ubuntu-latest
 

diff --git a/dune-project b/dune-project
@@ -12,21 +12,13 @@
 (source (github ocsigen/lwt))
 (documentation "https://ocsigen.org/lwt")
 
-(package
- (name lwt_ppx_let)
- (synopsis "Dummy package context for ppx_let tests")
- (description "Internal package used to partition ppx_let tests.")
- (depends
-  (ocaml (>= 4.08))
-  (ppx_let :with-test)
-  lwt))
-
 (package
  (name lwt_ppx)
  (synopsis "PPX syntax for Lwt, providing something similar to async/await from JavaScript")
  (depends
   (ocaml (>= 4.08))
   (ppxlib (>= 0.16.0))
+  (ppx_let :with-test)
   lwt))
 
 (package

diff --git a/lwt.opam.template b/lwt.opam.template
@@ -22,3 +22,4 @@ build: [
     "@doc" {with-doc}
   ]
 ]
+available: os-family != "windows" | "ocaml-version" < "5.2"
diff --git a/lwt_ppx.opam b/lwt_ppx.opam
@@ -14,8 +14,10 @@ depends: [
   "dune" {>= "2.0"}
   "ocaml" {>= "4.08"}
   "ppxlib" {>= "0.16.0"}
+  "ppx_let" {with-test}
   "lwt"
 ]
+dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -30,4 +32,3 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ocsigen/lwt.git"
diff --git a/lwt_ppx.opam.template b/lwt_ppx.opam.template
@@ -0,0 +1,14 @@
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
diff --git a/lwt_ppx_let.opam b/lwt_ppx_let.opam
diff --git a/lwt_react.opam b/lwt_react.opam
@@ -16,6 +16,7 @@ depends: [
   "lwt" {>= "3.0.0"}
   "react" {>= "1.0.0"}
 ]
+dev-repo: "git+https://github.com/ocsigen/lwt.git"
 build: [
   ["dune" "subst"] {dev}
   [
@@ -30,4 +31,3 @@ build: [
     "@doc" {with-doc}
   ]
 ]
-dev-repo: "git+https://github.com/ocsigen/lwt.git"
diff --git a/lwt_react.opam.template b/lwt_react.opam.template
@@ -0,0 +1,14 @@
+build: [
+  ["dune" "subst"] {dev}
+  [
+    "dune"
+    "build"
+    "-p"
+    name
+    "-j"
+    jobs
+    "@install"
+    "@runtest" {with-test}
+    "@doc" {with-doc}
+  ]
+]
diff --git a/test/ppx_let/dune b/test/ppx_let/dune
@@ -5,5 +5,5 @@
 
 (rule
  (alias runtest)
- (package lwt_ppx_let)
+ (package lwt_ppx) ;; technically not part of lwt_ppx, but we want it tested and the dependency to ppxlib is already there
  (action (run %{exe:test.exe})))
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,3 +22,4 @@ build: [ @@
         "@doc" {with-doc}
       ]
     ]
+    available: os-family != "windows" | "ocaml-version" < "5.2"