[LTP] [PATCH v2 1/2] lib/test.sh: Remove temporary directory only if we know the location

[LTP] [PATCH v2 1/2] lib/test.sh: Remove temporary directory only if we know the location

[Petr Vorel]

This is a problem when a test TCONF before calling tst_tmpdir, but has
tst_rmdir in cleanup function (e.g. dhcp_lib.sh when failing on
tst_check_cmds).

Now it has the same behaviour as deleting $TST_TMPDIR in tst_do_exit
in tst_test.sh.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Ping old commit:
Changes v1->v2: just commit message.
---
 testcases/lib/test.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/testcases/lib/test.sh b/testcases/lib/test.sh
index 642f7eacf..d16444efa 100644
--- a/testcases/lib/test.sh
+++ b/testcases/lib/test.sh
@@ -132,8 +132,10 @@ tst_tmpdir()
 
 tst_rmdir()
 {
-	cd "$LTPROOT"
-	rm -r "$TST_TMPDIR"
+	if [ -n "$TST_TMPDIR" ]; then
+		cd "$LTPROOT"
+		rm -r "$TST_TMPDIR"
+	fi
 }
 
 #
-- 
2.13.2

[LTP] [PATCH v2 2/2] doc: Cleanup typo

[Petr Vorel]

From: Petr Vorel <petr.vorel@gmail.com>

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Just to prevent copy & paste error for people reading our wiki.
---
 doc/test-writing-guidelines.txt | 2 +-
 lib/tst_resource.c              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt
index 479c24e8c..ed6322b02 100644
--- a/doc/test-writing-guidelines.txt
+++ b/doc/test-writing-guidelines.txt
@@ -215,7 +215,7 @@ The path is constructed according to these rules:
 
 1. if '$LTPROOT' is set, return '$LTPROOT/testcases/data/$TCID'
 2. else if 'tst_tmpdir()' was called return '$STARTWD/datafiles'
-   (where '$STARTWD' is initial working directory as recorded by 'tst_tmdir()')
+   (where '$STARTWD' is initial working directory as recorded by 'tst_tmpdir()')
 3. else return '$CWD/datafiles'
 
 See 'testcases/commands/file/' for example.
diff --git a/lib/tst_resource.c b/lib/tst_resource.c
index 78450df53..0b9b381f1 100644
--- a/lib/tst_resource.c
+++ b/lib/tst_resource.c
@@ -46,7 +46,7 @@ static void tst_dataroot_init(void)
 	int ret;
 
 	/* 1. if LTPROOT is set, use $LTPROOT/testcases/data/$TCID
-	 * 2. else if startwd is set by tst_tmdir(), use $STARWD/datafiles
+	 * 2. else if startwd is set by tst_tmpdir(), use $STARWD/datafiles
 	 * 3. else use $CWD/datafiles */
 	if (ltproot) {
 		ret = snprintf(dataroot, PATH_MAX, "%s/testcases/data/%s",
-- 
2.13.2

[LTP] [PATCH v2 2/2] doc: Cleanup typo

[Cyril Hrubis]

Hi!
Pushed, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH v2 1/2] lib/test.sh: Remove temporary directory only if we know the location

[Cyril Hrubis]

Hi!
> This is a problem when a test TCONF before calling tst_tmpdir, but has
> tst_rmdir in cleanup function (e.g. dhcp_lib.sh when failing on
> tst_check_cmds).

I was wondering if we should produce at least TINFO message that
something is probably wrong with the cleanup function, but nobody would
read that unless we used TWARN.

So I guess that the patch is OK as it is, pushed, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH v2 1/2] lib/test.sh: Remove temporary directory only if we know the location

[Petr Vorel]

Hi Cyril,

> Hi!
> > This is a problem when a test TCONF before calling tst_tmpdir, but has
> > tst_rmdir in cleanup function (e.g. dhcp_lib.sh when failing on
> > tst_check_cmds).

> I was wondering if we should produce at least TINFO message that
> something is probably wrong with the cleanup function, but nobody would
> read that unless we used TWARN.
Actually I think it's a good idea to put TWARN. That would indeed help to us to catch
errors in scripts.

> So I guess that the patch is OK as it is, pushed, thanks.
Thanks!


Kind regards,
Petr