fixup! move test in admin testfile

ocaml · Oct 25, 2024 · 0fe1648 · 0fe1648
1 parent fcfaa59
commit 0fe1648
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 41 deletions.
diff --git a/tests/reftests/admin.test b/tests/reftests/admin.test
@@ -654,9 +654,31 @@ opam-version: "2.0"
 ### ::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ### :: Cache is tested in admin-cache.test ::
 ### ::::::::::::::::::::::::::::::::::::::::::::::::::::::
-### :
+### :::::::::::::::::::::
+### :VII: compare-versions :
+### :::::::::::::::::::::
+### opam admin compare-versions 0.0.9 0.0.10
+0.0.9 < 0.0.10
+### opam admin compare-versions 1.2.3 1.2.3~preview
+1.2.3 > 1.2.3~preview
+### opam admin compare-versions 1.2.3 1.2.3-option
+1.2.3 < 1.2.3-option
+### opam admin compare-versions 0.1.0 0.01.0
+0.1.0 = 0.01.0
+### opam admin compare-versions 0.2.2 0.2.0
+0.2.2 > 0.2.0
+### opam admin compare-versions 0.0.9 --lt 0.0.10
+### opam admin compare-versions 1.2.3 --lt 1.2.3~preview
+# Return code 1 #
+### opam admin compare-versions 0.1.0 --eq 0.01.0
+### opam admin compare-versions 0.0.9 --eq 0.0.10
+# Return code 1 #
+### opam admin compare-versions 0.1.0 --le 0.1.0
+### opam admin compare-versions 0.0.9 --le 0.0.10
+### opam admin compare-versions 0.2.2 --le 0.2.1
+# Return code 1 #
 ### ::::::::::::::::::::::
-### :VII: Specific cases :
+### :C: Specific cases :
 ### ::::::::::::::::::::::
 ### : Package version comparison error (#5334)
 ### <packages/fail-5334/fail-5334.1/opam>

diff --git a/tests/reftests/compare-versions.test b/tests/reftests/compare-versions.test
diff --git a/tests/reftests/dune.inc b/tests/reftests/dune.inc
@@ -188,24 +188,6 @@
    %{targets}
    (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:cli-versioning.test} %{read-lines:testing-env}))))
 
-(rule
- (alias reftest-compare-versions)
- (action
-  (diff compare-versions.test compare-versions.out)))
-
-(alias
- (name reftest)
- (deps (alias reftest-compare-versions)))
-
-(rule
- (targets compare-versions.out)
- (deps root-N0REP0)
- (package opam)
- (action
-  (with-stdout-to
-   %{targets}
-   (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:compare-versions.test} %{read-lines:testing-env}))))
-
 (rule
  (alias reftest-config)
  (enabled_if (and  (or (<> %{env:TESTALL=1} 0) (= %{env:TESTN0REP0=0} 1))))