diff options
| author | Stefan Sauer <ensonic@users.sf.net> | 2019-08-16 10:31:17 +0200 |
|---|---|---|
| committer | Stefan Sauer <ensonic@users.sf.net> | 2019-08-16 10:33:16 +0200 |
| commit | 283a263d5505c4c881fb1b3781b3ad291f09cd75 (patch) | |
| tree | ba3327e614b82ad4877fce3c0fbcb0d1c9076c83 | |
| parent | 3cbc5c8c267ba81a1664f6a83a0d9217ddec01da (diff) | |
| download | gtk-doc-283a263d5505c4c881fb1b3781b3ad291f09cd75.tar.gz | |
tests: calculate time differences with date instead of bc
Fixes #99
| -rw-r--r-- | .gitlab-ci/debian.Dockerfile | 1 | ||||
| -rw-r--r-- | tests/gtk-doc.make | 16 |
2 files changed, 8 insertions, 9 deletions
diff --git a/.gitlab-ci/debian.Dockerfile b/.gitlab-ci/debian.Dockerfile index 5015385..7a75b3f 100644 --- a/.gitlab-ci/debian.Dockerfile +++ b/.gitlab-ci/debian.Dockerfile @@ -3,7 +3,6 @@ FROM debian:unstable RUN apt-get update -qq && apt-get install --no-install-recommends -qq -y \ autoconf \ automake \ - bc \ build-essential \ dblatex \ docbook \ diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make index 5b54a72..9235874 100644 --- a/tests/gtk-doc.make +++ b/tests/gtk-doc.make @@ -64,11 +64,11 @@ GITIGNOREFILES = \ html.ref xml.ref check-local: html-build.stamp pdf-build.stamp - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ + @ts=`cat ts`;tsd=`date -d "now - $$ts seconds" $(TS_FMT)`; \ echo " DOC `$(DATE_FMT_CMD)$$tsd`: All done" docs: html-build.stamp pdf-build.stamp - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ + @ts=`cat ts`;tsd=`date -d "now - $$ts seconds" $(TS_FMT)`; \ echo " DOC `$(DATE_FMT_CMD)$$tsd`: All done" $(REPORT_FILES): sgml-build.stamp @@ -96,7 +96,7 @@ setup-build.stamp: ts #### scan #### scan-build.stamp: ts setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ + @ts=`cat ts`;tsd=`date -d "now - $$ts seconds" $(TS_FMT)`; \ echo " DOC `$(DATE_FMT_CMD)$$tsd`: Scanning header files" @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ @@ -106,7 +106,7 @@ scan-build.stamp: ts setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) PATH=$(abs_top_builddir):$(PATH) PYTHONPATH=$(abs_top_builddir):$(abs_top_srcdir):$(PYTHONPATH) \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) 2>&1 | tee -a gtkdoc-scan.log @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ + ts=`cat ts`;tsd=`date -d "now - $$ts seconds" $(TS_FMT)`; \ echo " DOC `$(DATE_FMT_CMD)$$tsd`: Introspecting gobjects"; \ scanobj_options=""; \ if test "x$(V)" = "x1"; then \ @@ -129,7 +129,7 @@ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE) #### xml #### sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ + @ts=`cat ts`;tsd=`date -d "now - $$ts seconds" $(TS_FMT)`; \ echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building XML" @_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ @@ -160,7 +160,7 @@ xml/gtkdocentities.ent: Makefile #### html #### html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ + @ts=`cat ts`;tsd=`date -d "now - $$ts seconds" $(TS_FMT)`; \ echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building HTML" @rm -rf html @mkdir html @@ -176,7 +176,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ done; - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ + @ts=`cat ts`;tsd=`date -d "now - $$ts seconds" $(TS_FMT)`; \ echo " DOC `$(DATE_FMT_CMD)$$tsd`: Fixing cross-references" @echo "gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)" >gtkdoc-fixxref.log; \ PATH=$(abs_top_builddir):$(PATH) PYTHONPATH=$(abs_top_builddir):$(abs_top_srcdir):$(PYTHONPATH) \ @@ -186,7 +186,7 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) #### pdf #### pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @ts1=`cat ts`;ts2=`date $(TS_FMT)`;tsd=`echo $$ts2-$$ts1 | bc`; \ + @ts=`cat ts`;tsd=`date -d "now - $$ts seconds" $(TS_FMT)`; \ echo " DOC `$(DATE_FMT_CMD)$$tsd`: Building PDF" @rm -f $(DOC_MODULE).pdf @mkpdf_options=""; \ |