walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Install fonttools on two bots and enable cmake hb-subset test (#777)

This commit is contained in:
Ebrahim Byagowi 2018-02-11 15:40:55 +03:30 committed by GitHub
parent c8d4c2e32f
commit ae6d0259b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -7,7 +7,8 @@ jobs:
- image: ubuntu:17.10 - image: ubuntu:17.10
steps: steps:
- checkout - checkout
- run: apt update && apt install -y ninja-build binutils libtool autoconf automake make cmake gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev - run: apt update && apt install -y ninja-build binutils libtool autoconf automake make cmake gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip
- run: pip install fonttools
- run: ./autogen.sh && make distcheck && rm -rf harfbuzz-* - run: ./autogen.sh && make distcheck && rm -rf harfbuzz-*
- run: make distdir && cd harfbuzz-* && cmake -DHB_CHECK=ON -Bbuild -H. -GNinja && ninja -Cbuild && CTEST_OUTPUT_ON_FAILURE=1 ninja -Cbuild test && ninja -Cbuild install - run: make distdir && cd harfbuzz-* && cmake -DHB_CHECK=ON -Bbuild -H. -GNinja && ninja -Cbuild && CTEST_OUTPUT_ON_FAILURE=1 ninja -Cbuild test && ninja -Cbuild install
@ -43,7 +44,8 @@ jobs:
- image: ubuntu:17.10 - image: ubuntu:17.10
steps: steps:
- checkout - checkout
- run: apt update && apt install -y ninja-build binutils cmake gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev - run: apt update && apt install -y ninja-build binutils cmake gcc g++ pkg-config ragel gtk-doc-tools libfreetype6-dev libglib2.0-dev libcairo2-dev libicu-dev libgraphite2-dev python python-pip
- run: pip install fonttools
- run: cmake -DHB_CHECK=ON -Bbuild -H. -GNinja - run: cmake -DHB_CHECK=ON -Bbuild -H. -GNinja
- run: ninja -Cbuild - run: ninja -Cbuild
- run: CTEST_OUTPUT_ON_FAILURE=1 ninja -Cbuild test - run: CTEST_OUTPUT_ON_FAILURE=1 ninja -Cbuild test

8
test/subset/CMakeLists.txt
View File

@ -2,9 +2,9 @@ if (HB_BUILD_UTILS)
file (READ "${CMAKE_CURRENT_SOURCE_DIR}/data/Makefile.sources" SOURCES) file (READ "${CMAKE_CURRENT_SOURCE_DIR}/data/Makefile.sources" SOURCES)
extract_make_variable (TESTS ${SOURCES}) extract_make_variable (TESTS ${SOURCES})
foreach (test IN ITEMS ${TESTS}) foreach (test IN ITEMS ${TESTS})
# TODO(grieger): Re-enable once ttx is available in CI environments. add_test (NAME ${test}
# add_test (NAME ${test} COMMAND python run-tests.py $<TARGET_FILE:hb-subset> "data/${test}"
# COMMAND python run-tests.py $<TARGET_FILE:hb-subset> "data/${test}" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) set_property(TEST ${test} PROPERTY SKIP_RETURN_CODE 77)
endforeach () endforeach ()
endif () endif ()