diff mbox

ndctl: fix test file paths, fix test bug

Message ID 1451940083-9455-1-git-send-email-ross.zwisler@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ross Zwisler Jan. 4, 2016, 8:41 p.m. UTC
Fix some paths that were recently changed from using 'lib' to 'test'.

Also provide another argument to open() in the dax-pmd.c test so that if
the file is created via O_CREAT, it doesn't end up with zeroed out
permissions which would make it unusable.

Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
---

This patch is against the current 'pending' branch tip on github:
4872e0175a12 ("ndctl: create namespace")

---
 test/dax-pmd.c | 3 ++-
 test/dax.sh    | 4 ++--
 test/mmap.sh   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

Comments

Williams, Dan J Jan. 4, 2016, 8:55 p.m. UTC | #1
On Mon, Jan 4, 2016 at 12:41 PM, Ross Zwisler
<ross.zwisler@linux.intel.com> wrote:
> Fix some paths that were recently changed from using 'lib' to 'test'.
>
> Also provide another argument to open() in the dax-pmd.c test so that if
> the file is created via O_CREAT, it doesn't end up with zeroed out
> permissions which would make it unusable.
>
> Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
> ---
>

Looks good, thanks Ross!
diff mbox

Patch

diff --git a/test/dax-pmd.c b/test/dax-pmd.c
index bf21160..ff0c70e 100644
--- a/test/dax-pmd.c
+++ b/test/dax-pmd.c
@@ -89,7 +89,8 @@  static int test_pmd(int fd)
 			break;
 		}
 
-		fd2 = open(TEST_FILE, O_CREAT|O_TRUNC|O_DIRECT|O_RDWR);
+		fd2 = open(TEST_FILE, O_CREAT|O_TRUNC|O_DIRECT|O_RDWR,
+				DEFFILEMODE);
 		if (fd2 < 0) {
 			faili(i);
 			munmap(addr, 2*HPAGE_SIZE);
diff --git a/test/dax.sh b/test/dax.sh
index e83e76d..c5fce47 100755
--- a/test/dax.sh
+++ b/test/dax.sh
@@ -24,11 +24,11 @@  DEV=$(test/dax-dev)
 mkfs.ext4 $DEV
 mount $DEV $MNT -o dax
 fallocate -l 1GiB $MNT/$FILE
-lib/test-dax-pmd $MNT/$FILE
+test/dax-pmd $MNT/$FILE
 umount $MNT
 
 mkfs.xfs -f $DEV
 mount $DEV $MNT -o dax
 fallocate -l 1GiB $MNT/$FILE
-lib/test-dax-pmd $MNT/$FILE
+test/dax-pmd $MNT/$FILE
 umount $MNT
diff --git a/test/mmap.sh b/test/mmap.sh
index 84725ab..745962b 100755
--- a/test/mmap.sh
+++ b/test/mmap.sh
@@ -2,7 +2,7 @@ 
 MNT=test_mmap_mnt
 FILE=image
 DEV=""
-TEST=lib/test-mmap
+TEST=test/mmap
 
 err() {
 	rc=1