Commit f7868ee0 authored by Chris Lamb's avatar Chris Lamb 👀
Browse files

Build OCaml test input files on-demand rather than shipping them with the...

Build OCaml test input files on-demand rather than shipping them with the package in order to prevent test failures with OCaml 4.08 (Closes: Debian:#939386, #67)

This is related to #66
parent e5b82689
Loading
Loading
Loading
Loading
Loading
+21 −2
Original line number Diff line number Diff line
@@ -21,13 +21,32 @@ import pytest
import subprocess

from diffoscope.comparators.ocaml import OcamlInterfaceFile
from diffoscope.comparators.binary import FilesystemFile
from diffoscope.comparators.utils.specialize import specialize

from ..utils.data import load_fixture, get_data
from ..utils.tools import skip_unless_tool_is_at_least
from ..utils.nonexisting import assert_non_existing

cmi1 = load_fixture('test1.cmi')
cmi2 = load_fixture('test2.cmi')

def ocaml_fixture(prefix):
    @pytest.fixture
    def cmi(tmpdir):
        input_ = str(tmpdir.join('{}.mli'.format(prefix)))
        output = str(tmpdir.join('{}.cmi'.format(prefix)))

        with open(input_, 'w') as f:
            pass

        subprocess.check_call(('ocamlc', '-c', input_))

        return specialize(FilesystemFile(output))

    return cmi


cmi1 = ocaml_fixture('test1')
cmi2 = ocaml_fixture('test2')


def ocaml_version():
+5 −12
Original line number Diff line number Diff line
@@ -1,5 +1,14 @@
 Unit name: Uchar
@@ -1,5 +1,5 @@
-Unit name: Test1
+Unit name: Test2
 Interfaces imported:
 	84838649f9351de166bfa8b9f2c84db4	Uchar
-	b5f47409a5d1c32a864ea3d2fbed44db	Test1
+	9ee19396ca59dbe57206a9a88d98a7d5	Test2
 	07ea9e20ae94d62c35cfecbe7d66d3ea	Pervasives
 	cbd5f2d6b649925222e1e9fb63b89db6	CamlinternalFormatBasics
+Cmt unit name: Uchar
+Cmt interfaces imported:
+	cbd5f2d6b649925222e1e9fb63b89db6	CamlinternalFormatBasics
+	07ea9e20ae94d62c35cfecbe7d66d3ea	Pervasives
+	84838649f9351de166bfa8b9f2c84db4	Uchar
+Source file: uchar.mli
+Compilation flags: ../ocamlc -strict-sequence -absname -w +a-4-9-41-42-44-45-48 -g -warn-error A -bin-annot -nostdlib -safe-string -strict-formats -c uchar.mli
+Load path: 
+cmt interface digest: 84838649f9351de166bfa8b9f2c84db4

tests/data/test1.cmi

deleted100644 → 0
−1.1 KiB

File deleted.

tests/data/test2.cmi

deleted100644 → 0
−11.2 KiB

File deleted.