diff options
| -rw-r--r-- | gerbolyze/tests/test_integration.py | 16 | ||||
| -rw-r--r-- | podman/arch-testenv | 2 | ||||
| -rwxr-xr-x | podman/testdata/testscript.sh | 13 | ||||
| -rw-r--r-- | podman/ubuntu-testenv | 2 | ||||
| -rwxr-xr-x | run-tests.sh | 8 |
5 files changed, 28 insertions, 13 deletions
diff --git a/gerbolyze/tests/test_integration.py b/gerbolyze/tests/test_integration.py index c930b87..7c3ac20 100644 --- a/gerbolyze/tests/test_integration.py +++ b/gerbolyze/tests/test_integration.py @@ -40,26 +40,26 @@ def run_command(*args): def test_template_round_trip(): with tempfile.NamedTemporaryFile(suffix='.svg') as out_svg,\ tempfile.TemporaryDirectory() as out_dir: - run_command('python', '-m', 'gerbolyze', 'empty-template', '--force', out_svg.name) - run_command('python', '-m', 'gerbolyze', 'convert', out_svg.name, out_dir) + run_command('python3', '-m', 'gerbolyze', 'empty-template', '--force', out_svg.name) + run_command('python3', '-m', 'gerbolyze', 'convert', out_svg.name, out_dir) def test_zip_write(): with tempfile.NamedTemporaryFile(suffix='.svg') as out_svg,\ tempfile.NamedTemporaryFile(suffix='.zip') as out_zip: - run_command('python', '-m', 'gerbolyze', 'empty-template', '--force', out_svg.name) - run_command('python', '-m', 'gerbolyze', 'convert', out_svg.name, out_zip.name) + run_command('python3', '-m', 'gerbolyze', 'empty-template', '--force', out_svg.name) + run_command('python3', '-m', 'gerbolyze', 'convert', out_svg.name, out_zip.name) @pytest.mark.parametrize('reference', REFERENCE_SVGS) def test_complex_conversion(reference): infile = reference_path(reference) with tempfile.NamedTemporaryFile(suffix='.zip') as out_zip: - run_command('python', '-m', 'gerbolyze', 'convert', infile, out_zip.name) - run_command('python', '-m', 'gerbolyze', 'convert', '--pattern-complete-tiles-only', '--use-apertures-for-patterns', infile, out_zip.name) + run_command('python3', '-m', 'gerbolyze', 'convert', infile, out_zip.name) + run_command('python3', '-m', 'gerbolyze', 'convert', '--pattern-complete-tiles-only', '--use-apertures-for-patterns', infile, out_zip.name) @pytest.mark.parametrize('reference', REFERENCE_GERBERS) def test_template(reference): with tempfile.NamedTemporaryFile(suffix='.zip') as out_svg: infile = reference_path(reference) - run_command('python', '-m', 'gerbolyze', 'template', '--top', '--force', infile, out_svg.name) - run_command('python', '-m', 'gerbolyze', 'template', '--bottom', '--force', '--vector', infile, out_svg.name) + run_command('python3', '-m', 'gerbolyze', 'template', '--top', '--force', infile, out_svg.name) + run_command('python3', '-m', 'gerbolyze', 'template', '--bottom', '--force', '--vector', infile, out_svg.name) diff --git a/podman/arch-testenv b/podman/arch-testenv index ec05243..11b3087 100644 --- a/podman/arch-testenv +++ b/podman/arch-testenv @@ -7,4 +7,4 @@ RUN python3 -m pip install pytest-parallel RUN rustup install stable RUN rustup default stable RUN cargo install usvg resvg - +RUN python3 -m pip install --upgrade gerbonara diff --git a/podman/testdata/testscript.sh b/podman/testdata/testscript.sh index d36560d..b68f12a 100755 --- a/podman/testdata/testscript.sh +++ b/podman/testdata/testscript.sh @@ -1,7 +1,18 @@ #!/bin/sh set -e -rsync -av /data/git git +rsync -a /data/git/ git/ cd git +git config --global --add safe.directory $(realpath git) + +cp svg-flatten/build/svg-flatten.wasm svg-flatten/svg_flatten_wasi/ +cd svg-flatten +python3 setup.py install +cd .. + +pip install --upgrade --no-cache-dir 'gerbonara>=0.11.0' +python3 setup.py install + +export WASMTIME_BACKTRACE_DETAILS=1 python3 -m pytest $@ diff --git a/podman/ubuntu-testenv b/podman/ubuntu-testenv index 5bd275e..6f38dbb 100644 --- a/podman/ubuntu-testenv +++ b/podman/ubuntu-testenv @@ -5,4 +5,4 @@ RUN env DEBIAN_FRONTEND=noninteractive apt update -y RUN env DEBIAN_FRONTEND=noninteractive apt install -y libopencv-dev libpugixml-dev libpangocairo-1.0-0 libpango1.0-dev libcairo2-dev clang make python3 git python3-wheel curl python3-pip python3-venv cargo rsync gerbv RUN cargo install usvg resvg RUN python3 -m pip install numpy slugify lxml click pillow scipy sphinx pytest beautifulsoup4 pytest-parallel - +RUN python3 -m pip install --upgrade gerbonara diff --git a/run-tests.sh b/run-tests.sh index 996c1e7..4138d7d 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -20,9 +20,13 @@ while [ $# -gt 0 ]; do esac done +make -C svg-flatten -j build/svg-flatten.wasm + +rm -rf podman/testdata/git mkdir -p podman/testdata/git -git ls-tree --full-tree -r HEAD --name-only | rsync -lptgoDv --delete . --files-from - podman/testdata/git/ -#git clone --depth 1 . podman/testdata/git +git clone --depth 1 . podman/testdata/git +git ls-tree --full-tree -r HEAD --name-only | rsync -lptgoD --delete . --files-from - podman/testdata/git/ +rsync -a --delete svg-flatten/build/svg-flatten.wasm podman/testdata/git/svg-flatten/build/ for distro in ubuntu-old ubuntu arch do |