diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-07-30 15:03:10 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-07-30 15:03:10 -0700 |
| commit | 7ebe164ae027972cf2a7c05fa9021fb489d063cb (patch) | |
| tree | 60b3e3ce7a01a6bbd608d3afdf05461fbadaa029 /pkgs/build-support | |
| parent | 428f9ad382d2f0911ff3c70e55f427d305002b3e (diff) | |
| parent | 942e74bec8ba8d3de286f16a68dd73f22b78ce00 (diff) | |
| download | nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.gz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.bz2 nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.lz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.xz nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.tar.zst nixlib-7ebe164ae027972cf2a7c05fa9021fb489d063cb.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh | 11 | ||||
| -rw-r--r-- | pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh index 4b8abb61ace5..9108b4c50355 100644 --- a/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh +++ b/pkgs/build-support/setup-hooks/make-coverage-analysis-report.sh @@ -10,9 +10,16 @@ coverageReportPhase() { mkdir -p $out/coverage genhtml app.info $lcovExtraTraceFiles -o $out/coverage > log - # Grab the overall coverage percentage for use in release overviews. + # Grab the overall coverage percentage so that Hydra can plot it over time. mkdir -p $out/nix-support - grep "Overall coverage rate" log | sed 's/^.*(\(.*\)%).*$/\1/' > $out/nix-support/coverage-rate + lineCoverage="$(sed 's/.*lines\.*: \([0-9\.]\+\)%.*/\1/; t ; d' log)" + functionCoverage="$(sed 's/.*functions\.*: \([0-9\.]\+\)%.*/\1/; t ; d' log)" + if [ -z "$lineCoverage" -o -z "$functionCoverage" ]; then + echo "failed to get coverage statistics" + exit 1 + fi + echo "lineCoverage $lineCoverage %" >> $out/nix-support/hydra-metrics + echo "functionCoverage $functionCoverage %" >> $out/nix-support/hydra-metrics echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products } diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index 4b1a9527b110..e9fc7f7062d2 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -1,5 +1,13 @@ gappsWrapperArgs=() +find_gio_modules() { + if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then + gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "$1/lib/gio/modules") + fi +} + +envHooks+=(find_gio_modules) + wrapGAppsHook() { if [ -n "$GDK_PIXBUF_MODULE_FILE" ]; then gappsWrapperArgs+=(--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE") |