Skip to content
This repository was archived by the owner on Apr 13, 2021. It is now read-only.

Commit 4eb2dc3

Browse files
committed
fix bug, pr comments
1 parent 7569f24 commit 4eb2dc3

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

DEVELOPMENT.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Follow these instructions if you intend to make changes to libswiftnav.
55

66
Tools needed:
77
* doxygen
8+
* convert from ImageMagick
89
* pip install gcovr diff-cover
910

1011
To get started, run::
@@ -16,4 +17,4 @@ This makes the directory if it doesn't already exist, runs cmake with `Coverage`
1617
inside it, and installs a git pre-commit hook that runs style and code-coverage checkers
1718
in this build directory. These checks require doxygen, gcovr, and diff-cover
1819

19-
To manually run the coverage task, use `make coverage`. For syntax, use `make style`.
20+
To manually run the coverage task, use `make check-coverage`. For syntax, use `make check-style`.

checks/pre-commit

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
set -e
21
echo "precommit running. checking build located at ${subdir}."
3-
cd ${subdir}
4-
../checks/run-coverage.sh
5-
6-
#echo "commit failed"
7-
exit 1
2+
cd "${subdir}"
3+
make check-coverage

checks/setup-hooks.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# set up build directory
22
builddir=${1:-build/} # by default use build/
33
echo "Build directory: ${builddir}"
4-
mkdir -p $builddir
5-
( cd $builddir && cmake -DCMAKE_BUILD_TYPE=Coverage .. )
4+
mkdir -p "$builddir"
5+
( cd "$builddir" && cmake -DCMAKE_BUILD_TYPE=Coverage .. )
66

7-
hooks="`git rev-parse --git-dir`/hooks"
7+
hooks="$(git rev-parse --git-dir)/hooks"
88
echo "Installing hook at: ${hooks}"
99
# insert value of builddir as first line of pre-commit
1010
echo "subdir=$builddir" | cat - checks/pre-commit > "$hooks/pre-commit"

tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ else (CMAKE_CROSSCOMPILING)
7373
COMMAND ../checks/run-coverage.sh
7474
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
7575
)
76-
add_custom_target(coverage DEPENDS diffreport.html)
76+
add_custom_target(check-coverage DEPENDS diffreport.html)
7777

7878
endif (NOT CHECK_FOUND)
7979
endif (CMAKE_CROSSCOMPILING)

0 commit comments

Comments
 (0)