Patchwork [v3,2/2] live-image/fwts-frontend-text: conditional added to done_tests_finish() which creates a symbolic link to the latest results.html at the top level WORK_DIR

login
register
mail settings
Submitter Keng-Yu Lin
Date June 14, 2012, 3:47 a.m.
Message ID <1339645676-18503-2-git-send-email-kengyu@canonical.com>
Download mbox | patch
Permalink /patch/164793/
State Rejected
Headers show

Comments

Keng-Yu Lin - June 14, 2012, 3:47 a.m.
From: Chris Van Hoof <vanhoof@canonical.com>

Signed-off-by: Chris Van Hoof <vanhoof@canonical.com>
---
 live-image/fwts-frontend-text |    7 +++++++
 1 file changed, 7 insertions(+)
Keng-Yu Lin - June 14, 2012, 3:52 a.m.
On Thu, Jun 14, 2012 at 11:47 AM, Keng-Yu Lin <kengyu@canonical.com> wrote:
> From: Chris Van Hoof <vanhoof@canonical.com>
>
> Signed-off-by: Chris Van Hoof <vanhoof@canonical.com>
> ---
>  live-image/fwts-frontend-text |    7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text
> index 90c0fc7..932c068 100755
> --- a/live-image/fwts-frontend-text
> +++ b/live-image/fwts-frontend-text
> @@ -195,6 +195,13 @@ no_tests_finish()
>  #
>  done_tests_finish()
>  {
> +    if [ -n "${CASPER_DETECTED:+x}" ]; then
> +        cd $WORK_DIR
> +        ln -sf ./results.html ../../results.html
> +    else
> +        ln -sf $WORK_DIR/results.html /fwts/results.html
> +    fi
> +
>        dialog  --backtitle "$FWTS" --title "Testing Complete" --yesno \
>  "The results can be found on the USB stick in the\n
>  the directory: /fwts/$FWTS_DATE/$FWTS_TIME/results.log\n\n
> --
> 1.7.9.5
>

NAK, Chris already sent his.

Patch

diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text
index 90c0fc7..932c068 100755
--- a/live-image/fwts-frontend-text
+++ b/live-image/fwts-frontend-text
@@ -195,6 +195,13 @@  no_tests_finish()
 #
 done_tests_finish()
 {
+    if [ -n "${CASPER_DETECTED:+x}" ]; then
+        cd $WORK_DIR
+        ln -sf ./results.html ../../results.html
+    else
+        ln -sf $WORK_DIR/results.html /fwts/results.html
+    fi
+
 	dialog  --backtitle "$FWTS" --title "Testing Complete" --yesno \
 "The results can be found on the USB stick in the\n
 the directory: /fwts/$FWTS_DATE/$FWTS_TIME/results.log\n\n