Skip to content

[build] Makefile changes: print time for tests; dash-compatibility change #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danpovey merged 2 commits into from
Jan 7, 2017
Merged

[build] Makefile changes: print time for tests; dash-compatibility change #1322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9088f1e
[tools] small tools/Makefile change for dash compatibility, change ==…
danpovey Jan 3, 2017
f1e0bcc
Modify makefiles/default_rules.mk to print timing for tests
danpovey Jan 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/makefiles/default_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,16 +78,20 @@ test: test_compile
@{ result=0; \
for x in $(TESTFILES); do \
printf "Running $$x ..."; \
timestamp1=$$(date +"%s"); \
./$$x >$$x.testlog 2>&1; \
if [ $$? -ne 0 ]; then \
echo "... FAIL $$x"; \
ret=$$? \
timestamp2=$$(date +"%s"); \
time_taken=$$[timestamp2-timestamp1]; \
if [ $$ret -ne 0 ]; then \
echo " $${time_taken}s... FAIL $$x"; \
result=1; \
if [ -n "$TRAVIS" ] && [ -f core ] && command -v gdb >/dev/null 2>&1; then \
gdb $$x core -ex "thread apply all bt" -batch >>$$x.testlog 2>&1; \
rm -rf core; \
fi; \
else \
echo "... SUCCESS"; \
echo " $${time_taken}s... SUCCESS"; \
rm -f $$x.testlog; \
fi; \
done; \
Expand Down
2 changes: 1 addition & 1 deletion tools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ else ifeq ($(OS),Windows_NT)
cd openfst-$(OPENFST_VERSION)/; ./configure --prefix=`pwd` --enable-static --enable-shared --enable-far --enable-ngram-fsts CXX=$(CXX) CXXFLAGS="$(CXXFLAGS) -O -Wa,-mbig-obj" LDFLAGS="$(LDFLAGS)" LIBS="-ldl"
else
# ppc64le needs the newsted config.guess to be correctly indentified
[ "$(shell uname -p)" == "ppc64le" ] && wget -O openfst-$(OPENFST_VERSION)/config.guess \
[ "$(shell uname -p)" = "ppc64le" ] && wget -O openfst-$(OPENFST_VERSION)/config.guess \
"http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD" || \
echo "config.guess unchanged"
cd openfst-$(OPENFST_VERSION)/; ./configure --prefix=`pwd` --enable-static --enable-shared --enable-far --enable-ngram-fsts CXX=$(CXX) CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="-ldl"
Expand Down