Browse Source

Use a different directory for the various disk tests, and clean it after run

Samuel Thibault 10 years ago
parent
commit
3d86ff041d
3 changed files with 6 additions and 3 deletions
  1. 2 1
      tests/disk/disk_compute.c
  2. 2 1
      tests/disk/disk_copy.c
  3. 2 1
      tests/disk/disk_pack.c

+ 2 - 1
tests/disk/disk_compute.c

@@ -213,12 +213,13 @@ int main(void)
 {
 	int ret = 0;
 	char s[128];
-	snprintf(s, sizeof(s), "/tmp/%s-disk", getenv("USER"));
+	snprintf(s, sizeof(s), "/tmp/%s-disk-%d", getenv("USER"), getpid());
 	mkdir(s, 0777);
 	ret = merge_result(ret, dotest(&starpu_disk_stdio_ops, s));
 	ret = merge_result(ret, dotest(&starpu_disk_unistd_ops, s));
 #ifdef STARPU_LINUX_SYS
 	ret = merge_result(ret, dotest(&starpu_disk_unistd_o_direct_ops, s));
 #endif
+	rmdir(s);
 	return ret;
 }

+ 2 - 1
tests/disk/disk_copy.c

@@ -153,13 +153,14 @@ int main(void)
 {
 	int ret = 0;
 	char s[128];
-	snprintf(s, sizeof(s), "/tmp/%s-disk", getenv("USER"));
+	snprintf(s, sizeof(s), "/tmp/%s-disk-%d", getenv("USER"), getpid());
 	mkdir(s, 0777);
 	ret = merge_result(ret, dotest(&starpu_disk_stdio_ops, s));
 	ret = merge_result(ret, dotest(&starpu_disk_unistd_ops, s));
 #ifdef STARPU_LINUX_SYS
 	ret = merge_result(ret, dotest(&starpu_disk_unistd_o_direct_ops, s));
 #endif
+	rmdir(s);
 	return ret;
 }
 #endif

+ 2 - 1
tests/disk/disk_pack.c

@@ -243,12 +243,13 @@ int main(void)
 {
 	int ret = 0;
 	char s[128];
-	snprintf(s, sizeof(s), "/tmp/%s-disk", getenv("USER"));
+	snprintf(s, sizeof(s), "/tmp/%s-disk-%d", getenv("USER"), getpid());
 	mkdir(s, 0777);
 	ret = merge_result(ret, dotest(&starpu_disk_stdio_ops, s));
 	ret = merge_result(ret, dotest(&starpu_disk_unistd_ops, s));
 #ifdef STARPU_LINUX_SYS
 	ret = merge_result(ret, dotest(&starpu_disk_unistd_o_direct_ops, s));
 #endif
+	rmdir(s);
 	return ret;
 }