Skip to content

Commit

Permalink
Merge pull request #431 from thomas-weber/keep-src-clean
Browse files Browse the repository at this point in the history
Keep src tree clean by running tests in the build directory
Looks great, thank you!
  • Loading branch information
mm2 authored Jan 2, 2024
2 parents fe651ef + 802de2f commit 8364830
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
- name: Install packages
run: |
sudo apt-get -y install build-essential python3-pip ninja-build
pip install meson==0.59.2
pip install meson==0.64.0
- name: Build Ubuntu
run: |
Expand All @@ -95,7 +95,7 @@ jobs:

- name: Install packages
run: |
pip install meson==0.59.2
pip install meson==0.64.0
- uses: ilammy/msvc-dev-cmd@v1
- name: Build Windows
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project(
'Little-CMS',
'c',
version: '2.16',
meson_version: '>=0.49.0',
meson_version: '>=0.64.0',
# default_options: ['c_std=c99']
)

Expand Down
13 changes: 12 additions & 1 deletion testbed/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@ testcms_srcs = files(
'zoo_icc.c',
)

# copy all iccs to the build dir and run the tests there
iccs = [
'bad.icc', 'crayons.icc', 'new.icc', 'test2.icc', 'test4.icc', 'TestCLT.icc',
'bad_mpe.icc', 'ibm-t61.icc', 'test1.icc', 'test3.icc', 'test5.icc',
'toosmall.icc'
]
fs=import('fs')
foreach icc : iccs
fs.copyfile(icc)
endforeach

testcms = executable(
'testcms',
testcms_srcs,
Expand All @@ -14,6 +25,6 @@ testcms = executable(
test(
'testcms',
testcms,
workdir: meson.current_source_dir(),
workdir: meson.current_build_dir(),
timeout: 600,
)
1 change: 0 additions & 1 deletion utils/psicc/psicc.1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Input profile: Generates Color Space Array (CSA).
Alternate way to set precision, number of CLUT points (CRD only).
.TP
.BI \-o\ profile
.p
Output profile: Generates Color Rendering Dictionary(CRD).
.TP
.BI \-t\ intent
Expand Down
1 change: 0 additions & 1 deletion utils/transicc/transicc.1
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ SoftProof intent (0,1,2,3) [defaults to 0].
Terse output, intended for pipe usage.
.TP
.BI \-o\ profile
.p
Output profile (defaults to sRGB).
.TP
.B \-q
Expand Down

0 comments on commit 8364830

Please sign in to comment.