From b5e0167f755e35fa944ac000134b91334d01d3f2 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sun, 2 Aug 2009 17:53:44 -0400 Subject: [PATCH] Convert some cpio/test symlink/hardlink handling to new platform-independent test infrastructure. SVN-Revision: 1318 --- cpio/test/test_basic.c | 4 ++-- cpio/test/test_format_newc.c | 4 ++-- cpio/test/test_option_L_upper.c | 10 +++++----- cpio/test/test_option_c.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cpio/test/test_basic.c b/cpio/test/test_basic.c index 13bddfaea..e16160a05 100644 --- a/cpio/test/test_basic.c +++ b/cpio/test/test_basic.c @@ -200,11 +200,11 @@ DEFINE_TEST(test_basic) write(filelist, "file\n", 5); /* hardlink to above file. */ - assertEqualInt(0, link("file", "linkfile")); + assertMakeHardlink("linkfile", "file"); write(filelist, "linkfile\n", 9); /* Symlink to above file. */ - assertEqualInt(0, symlink("file", "symlink")); + assertMakeSymlink("symlink", "file"); write(filelist, "symlink\n", 8); /* Another file with different permissions. */ diff --git a/cpio/test/test_format_newc.c b/cpio/test/test_format_newc.c index 0533364bd..8d89112fe 100644 --- a/cpio/test/test_format_newc.c +++ b/cpio/test/test_format_newc.c @@ -91,10 +91,10 @@ DEFINE_TEST(test_format_newc) assertEqualInt(9, write(list, "hardlink\n", 9)); /* Another hardlink, but this one won't be archived. */ - assertEqualInt(0, link("file1", "hardlink2")); + assertMakeHardlink("hardlink2", "file1"); /* "symlink" */ - assertEqualInt(0, symlink("file1", "symlink")); + assertMakeSymlink("symlink", "file1"); assertEqualInt(8, write(list, "symlink\n", 8)); /* "dir" */ diff --git a/cpio/test/test_option_L_upper.c b/cpio/test/test_option_L_upper.c index db5f642c7..ebd0b030c 100644 --- a/cpio/test/test_option_L_upper.c +++ b/cpio/test/test_option_L_upper.c @@ -47,17 +47,17 @@ DEFINE_TEST(test_option_L_upper) write(filelist, "file\n", 5); /* Symlink to above file. */ - assertEqualInt(0, symlink("file", "symlink")); + assertMakeSymlink("symlink", "file"); write(filelist, "symlink\n", 8); close(filelist); r = systemf(CAT " filelist | %s -pd copy >copy.out 2>copy.err", testprog); assertEqualInt(r, 0); - assertEqualInt(0, lstat("copy/symlink", &st)); + #if !defined(_WIN32) || defined(__CYGWIN__) failure("Regular -p without -L should preserve symlinks."); - assert(S_ISLNK(st.st_mode)); + assertIsSymlink("copy/symlink", NULL); #endif r = systemf(CAT " filelist | %s -pd -L copy-L >copy-L.out 2>copy-L.err", testprog); @@ -82,9 +82,9 @@ DEFINE_TEST(test_option_L_upper) #endif failure("Error invoking %s -i", testprog); assertEqualInt(r, 0); - assertEqualInt(0, lstat("unpack/symlink", &st)); + #if !defined(_WIN32) || defined(__CYGWIN__) - assert(S_ISLNK(st.st_mode)); + assertIsSymlink("unpack/symlink", NULL); #endif r = systemf(CAT " filelist | %s -oL >archive-L.out 2>archive-L.err", testprog); diff --git a/cpio/test/test_option_c.c b/cpio/test/test_option_c.c index 23eabff79..3edec3021 100644 --- a/cpio/test/test_option_c.c +++ b/cpio/test/test_option_c.c @@ -77,7 +77,7 @@ DEFINE_TEST(test_option_c) assertEqualInt(5, write(filelist, "file\n", 5)); /* "symlink" */ - assertEqualInt(0, symlink("file", "symlink")); + assertMakeSymlink("symlink", "file"); assertEqualInt(8, write(filelist, "symlink\n", 8)); /* "dir" */ -- 2.47.3