diff options
| author | PMR <pmr@pmr-lander> | 2017-09-22 13:25:30 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2017-09-22 13:25:30 +0000 |
| commit | fbca9ec3976cfa1ccbc402a2a794bf92e6d1817c (patch) | |
| tree | 2eeac38af94d221b9510f80ce5ca1f2621946d79 | |
| parent | b70f12c70f3f4191d2ed4d608bc33e9c927d8013 (diff) | |
| parent | f6dbe3950b9ad155b4230e40daad6214410551ce (diff) | |
Merge #331126 from ~sylvain-pineau/plainbox-provider-checkbox:add_fwts_path_for_snappy
| -rw-r--r-- | units/suspend/suspend.pxu | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/units/suspend/suspend.pxu b/units/suspend/suspend.pxu index 60c489d..287071a 100644 --- a/units/suspend/suspend.pxu +++ b/units/suspend/suspend.pxu @@ -215,6 +215,9 @@ environ: PLAINBOX_SESSION_SHARE command: if type -P fwts >/dev/null; then echo "Calling fwts" + if [[ -v SNAP ]]; then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" + fi set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log else echo "Calling sleep_test" @@ -248,6 +251,9 @@ environ: PLAINBOX_SESSION_SHARE command: if type -P fwts >/dev/null; then echo "Calling fwts" + if [[ -v SNAP ]]; then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" + fi set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/{index}_suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/{index}_suspend_single_times.log else echo "Calling sleep_test" @@ -278,7 +284,11 @@ _description: This is the automated version of suspend/suspend_advanced. user: root environ: PLAINBOX_SESSION_SHARE -command: set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log +command: + if [[ -v SNAP ]]; then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" + fi + set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/suspend_single -s s3 --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 | tee $PLAINBOX_SESSION_SHARE/suspend_single_times.log estimated_duration: 90.000 unit: template @@ -288,6 +298,9 @@ category_id: com.canonical.plainbox::suspend id: suspend/{index}_hybrid_sleep_{product_slug} user: root command: + if [[ -v SNAP ]]; then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" + fi set -o pipefail; checkbox-support-fwts_test -f none -l $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single -s s3 --s3-hybrid --s3-sleep-delay=30 --s3-device-check --s3-device-check-delay=45 --pm-method=pm-utils | tee $PLAINBOX_SESSION_SHARE/{index}_hybrid_sleep_single_times.log estimated_duration: 90.0 _description: @@ -2870,6 +2883,9 @@ _description: Run Firmware Test Suite (fwts) oops tests after suspend. environ: PLAINBOX_SESSION_SHARE command: + if [[ -v SNAP ]]; then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SNAP/usr/lib/fwts" + fi checkbox-support-fwts_test -l $PLAINBOX_SESSION_SHARE/fwts_oops_results_after_s3.log -t oops id: suspend/oops_results_after_suspend.log |