Merge pull request #796 from ebraminio/dev-run

Add a continuous builder using fswatch
This commit is contained in:
Behdad Esfahbod 2018-02-18 14:04:33 -08:00 committed by GitHub
commit 279c70a5b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 12 deletions

View File

@ -63,6 +63,7 @@ if (HB_HAVE_INTROSPECTION)
set (HB_HAVE_GLIB ON) set (HB_HAVE_GLIB ON)
endif () endif ()
option(HB_DISABLE_TEST_PROGS OFF "Do not build some of the test programs, useful for continuous builds")
option(HB_CHECK OFF "Do a configuration suitable for testing (shared library and enable all options)") option(HB_CHECK OFF "Do a configuration suitable for testing (shared library and enable all options)")
if (HB_CHECK) if (HB_CHECK)
set (BUILD_SHARED_LIBS ON) set (BUILD_SHARED_LIBS ON)
@ -807,17 +808,18 @@ endif ()
## src/ executables ## src/ executables
foreach (prog main test test-would-substitute test-size-params test-buffer-serialize hb-ot-tag) if (NOT HB_DISABLE_TEST_PROGS)
set (prog_name ${prog}) foreach (prog main test test-would-substitute test-size-params test-buffer-serialize hb-ot-tag)
if (${prog_name} STREQUAL "test") set (prog_name ${prog})
# test can not be used as a valid executable name on cmake, lets special case it if (${prog_name} STREQUAL "test")
set (prog_name test-test) # test can not be used as a valid executable name on cmake, lets special case it
endif () set (prog_name test-test)
add_executable(${prog_name} ${PROJECT_SOURCE_DIR}/src/${prog}.cc) endif ()
target_link_libraries(${prog_name} harfbuzz ${THIRD_PARTY_LIBS}) add_executable(${prog_name} ${PROJECT_SOURCE_DIR}/src/${prog}.cc)
endforeach () target_link_libraries(${prog_name} harfbuzz ${THIRD_PARTY_LIBS})
set_target_properties(hb-ot-tag PROPERTIES COMPILE_FLAGS "-DMAIN") endforeach ()
set_target_properties(hb-ot-tag PROPERTIES COMPILE_FLAGS "-DMAIN")
endif ()
## Tests ## Tests
if (UNIX OR MINGW) if (UNIX OR MINGW)

22
src/dev-run.sh Executable file
View File

@ -0,0 +1,22 @@
#!/bin/bash
for cmd in cmake ninja fswatch; do
command -v $cmd >/dev/null 2>&1 || { echo >&2 "This script needs $cmd be installed"; exit 1; }
done
[ $# = 0 ] && echo Usage: "src/dev-run.sh [FONT-FILE] [TEXT]" && exit
cmake -DHB_CHECK=ON -DHB_DISABLE_TEST_PROGS=ON -Bbuild -H. -GNinja
ninja -Cbuild
# or "fswatch -0 . -e build/ -e .git"
find src/ | entr printf '\0' | while read -d "" event; do
clear
ninja -Cbuild
build/hb-shape $@
build/hb-view $@
done
cmake -DHB_CHECK=ON -DHB_DISABLE_TEST_PROGS=OFF -Bbuild -H. -GNinja
ninja -Cbuild
CTEST_OUTPUT_ON_FAILURE=1 CTEST_PARALLEL_LEVEL=8 ninja -Cbuild test

View File

@ -1,4 +1,4 @@
if (HB_HAVE_GLIB) if (HB_HAVE_GLIB AND NOT HB_DISABLE_TEST_PROGS)
file (READ "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.am" MAKEFILEAM) file (READ "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.am" MAKEFILEAM)
extract_make_variable (TEST_PROGS ${MAKEFILEAM}) extract_make_variable (TEST_PROGS ${MAKEFILEAM})