lib, include: Remove all references to TDIRECTORY.
It was not used at all TMPDIR is correct name for the env variable.
Signed-off-by: Cyril Hrubis <chrubis@suse.cz>
diff --git a/include/test.h b/include/test.h
index c922230..61aef71 100644
--- a/include/test.h
+++ b/include/test.h
@@ -117,16 +117,6 @@
* The following defines are used to control tst_tmpdir, tst_wildcard and t_mkchdir
*/
-#define TDIRECTORY "TDIRECTORY" /* The name of the environment variable */
- /* that if is set, the value (directory) */
- /* is used by all tests as their working */
- /* directory. tst_rmdir and t_rmdir will */
- /* not attempt to clean up. */
- /* This environment variable should only */
- /* be set when doing system testing since */
- /* tests will collide and break and fail */
- /* because of setting it. */
-
#define TEMPDIR "/tmp" /* This is the default temporary directory. */
/* The environment variable TMPDIR is */
/* used prior to this valid by tempnam(3). */
@@ -225,8 +215,6 @@
*
* Recursively remove the temporary directory created by tst_tmpdir().
* This function is intended ONLY as a companion to tst_tmpdir().
- * If the TDIRECTORY environment variable is set, no cleanup will be
- * attempted.
*/
void tst_rmdir(void);
/* get_tst_tmpdir()
diff --git a/lib/tst_tmpdir.c b/lib/tst_tmpdir.c
index 4029276..9fa28e4 100644
--- a/lib/tst_tmpdir.c
+++ b/lib/tst_tmpdir.c
@@ -52,11 +52,6 @@
* tst_rmdir() is used to remove the directory created by
* tst_tmpdir().
*
- * Setting the env variable "TDIRECTORY" will override the creation
- * of a new temp dir. The directory specified by TDIRECTORY will
- * be used as the temporary directory, and no removal will be done
- * in tst_rmdir().
- *
* RETURN VALUE
* Neither tst_tmpdir() or tst_rmdir() has a return value.
*
@@ -174,7 +169,6 @@
tmpdir_cleanup();
}
-
}
void tst_rmdir(void)
diff --git a/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh b/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
index 9a40caf..e41b104 100755
--- a/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
+++ b/testcases/kernel/fs/ext4-new-features/ext4-persist-prealloc/ext4_persist_prealloc_test.sh
@@ -37,7 +37,7 @@
read_config $1
# The test path of fallocate
-export TDIRECTORY=$PWD/mnt_point/
+export TMPDIR=$PWD/mnt_point/
# Use ltp's syscall/fallocate to test this feature
# $1: 1024 or 4096
diff --git a/testcases/kernel/syscalls/write/write02.c b/testcases/kernel/syscalls/write/write02.c
index 1092761..ad53a6d 100644
--- a/testcases/kernel/syscalls/write/write02.c
+++ b/testcases/kernel/syscalls/write/write02.c
@@ -135,8 +135,6 @@
tst_tmpdir();
-// Changed by prashant yendigeri, because the temp file was not being created in// the $TDIRECTORY
-// sprintf(pfiln, "./write1.%d", getpid());
sprintf(pfiln, "write1.%d", getpid());
}
@@ -155,5 +153,4 @@
unlink(pfiln);
tst_rmdir();
-
}