提交 7e47253b 编写于 作者: O openharmony_ci 提交者: Gitee

!95 NFS sync

Merge pull request !95 from jiyong/mybranch01
...@@ -250,7 +250,7 @@ HWTEST_F(FileSystemTest, testGlob, Function | MediumTest | Level3) ...@@ -250,7 +250,7 @@ HWTEST_F(FileSystemTest, testGlob, Function | MediumTest | Level3)
} }
globfree(&buf); globfree(&buf);
} }
#if 0
/** /**
* @tc.number SUB_KERNEL_FS_OTHER_0500 * @tc.number SUB_KERNEL_FS_OTHER_0500
* @tc.name basic function test : Use fwprintf function to write wide characters * @tc.name basic function test : Use fwprintf function to write wide characters
...@@ -276,3 +276,4 @@ HWTEST_F(FileSystemTest, testFwprintf, Function | MediumTest | Level3) ...@@ -276,3 +276,4 @@ HWTEST_F(FileSystemTest, testFwprintf, Function | MediumTest | Level3)
EXPECT_TRUE(wcscmp(writeBuf, readBuf) == 0) << "writeBuf != readBuf"; EXPECT_TRUE(wcscmp(writeBuf, readBuf) == 0) << "writeBuf != readBuf";
EXPECT_NE(fclose(fp), -1) << "> fclose errno =" << errno; EXPECT_NE(fclose(fp), -1) << "> fclose errno =" << errno;
} }
#endif
...@@ -50,7 +50,7 @@ HWTEST_F(FileSystemTest, testUmask, Function | MediumTest | Level2) ...@@ -50,7 +50,7 @@ HWTEST_F(FileSystemTest, testUmask, Function | MediumTest | Level2)
EXPECT_EQ(umask(maskPre), maskNew) << "> umask error"; EXPECT_EQ(umask(maskPre), maskNew) << "> umask error";
} }
#endif #endif
#if 0
/** /**
* @tc.number SUB_KERNEL_FS_STAT_0200 * @tc.number SUB_KERNEL_FS_STAT_0200
* @tc.name basic function test : Run the stat function to obtain the file status. * @tc.name basic function test : Run the stat function to obtain the file status.
...@@ -77,7 +77,7 @@ HWTEST_F(FileSystemTest, testStat, Function | MediumTest | Level3) ...@@ -77,7 +77,7 @@ HWTEST_F(FileSystemTest, testStat, Function | MediumTest | Level3)
LOG("> buf.st_mtim = %lds,%ldns", buf.st_mtim.tv_sec, buf.st_mtim.tv_nsec); // time for last file modification LOG("> buf.st_mtim = %lds,%ldns", buf.st_mtim.tv_sec, buf.st_mtim.tv_nsec); // time for last file modification
LOG("> buf.st_ctim = %lds,%ldns", buf.st_ctim.tv_sec, buf.st_ctim.tv_nsec); // time for last file status change LOG("> buf.st_ctim = %lds,%ldns", buf.st_ctim.tv_sec, buf.st_ctim.tv_nsec); // time for last file status change
} }
#endif
#if defined(LITE_FS_JFFS2) #if defined(LITE_FS_JFFS2)
#ifndef COMMERCIAL #ifndef COMMERCIAL
/** /**
...@@ -113,7 +113,7 @@ HWTEST_F(FileSystemTest, testStatLimt, Function | MediumTest | Level3) ...@@ -113,7 +113,7 @@ HWTEST_F(FileSystemTest, testStatLimt, Function | MediumTest | Level3)
} }
#endif #endif
#endif #endif
#if 0
/** /**
* @tc.number SUB_KERNEL_FS_STAT_0300 * @tc.number SUB_KERNEL_FS_STAT_0300
* @tc.name basic function test : Run the lstat function to obtain the file status. * @tc.name basic function test : Run the lstat function to obtain the file status.
...@@ -141,7 +141,7 @@ HWTEST_F(FileSystemTest, testLstat, Function | MediumTest | Level3) ...@@ -141,7 +141,7 @@ HWTEST_F(FileSystemTest, testLstat, Function | MediumTest | Level3)
LOG("> buf.st_mtim = %lds,%ldns", buf.st_mtim.tv_sec, buf.st_mtim.tv_nsec); // time for last file modification LOG("> buf.st_mtim = %lds,%ldns", buf.st_mtim.tv_sec, buf.st_mtim.tv_nsec); // time for last file modification
LOG("> buf.st_ctim = %lds,%ldns", buf.st_ctim.tv_sec, buf.st_ctim.tv_nsec); // time for last file status change LOG("> buf.st_ctim = %lds,%ldns", buf.st_ctim.tv_sec, buf.st_ctim.tv_nsec); // time for last file status change
} }
#endif
#if defined(LITE_FS_JFFS2) #if defined(LITE_FS_JFFS2)
#ifndef COMMERCIAL #ifndef COMMERCIAL
/** /**
...@@ -178,7 +178,7 @@ HWTEST_F(FileSystemTest, testLstatLimt, Function | MediumTest | Level3) ...@@ -178,7 +178,7 @@ HWTEST_F(FileSystemTest, testLstatLimt, Function | MediumTest | Level3)
} }
#endif #endif
#endif #endif
#if 0
/** /**
* @tc.number SUB_KERNEL_FS_STAT_0400 * @tc.number SUB_KERNEL_FS_STAT_0400
* @tc.name basic function test : Run the fstat function to obtain the file status. * @tc.name basic function test : Run the fstat function to obtain the file status.
...@@ -205,7 +205,7 @@ HWTEST_F(FileSystemTest, testFstat, Function | MediumTest | Level3) ...@@ -205,7 +205,7 @@ HWTEST_F(FileSystemTest, testFstat, Function | MediumTest | Level3)
LOG("> buf.st_ctim = %lds,%ldns", buf.st_ctim.tv_sec, buf.st_ctim.tv_nsec); // time for last file status change LOG("> buf.st_ctim = %lds,%ldns", buf.st_ctim.tv_sec, buf.st_ctim.tv_nsec); // time for last file status change
EXPECT_NE(close(fd), -1) << "> close errno = " << errno; EXPECT_NE(close(fd), -1) << "> close errno = " << errno;
} }
#endif
#if defined(LITE_FS_JFFS2) #if defined(LITE_FS_JFFS2)
#ifndef COMMERCIAL #ifndef COMMERCIAL
/** /**
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "libfs.h" #include "libfs.h"
using namespace testing::ext; using namespace testing::ext;
#if 0
/** /**
* @tc.number SUB_KERNEL_FS_STDIO_0100 * @tc.number SUB_KERNEL_FS_STDIO_0100
* @tc.name basic function test : read and write with stream * @tc.name basic function test : read and write with stream
...@@ -386,7 +386,7 @@ HWTEST_F(FileSystemTest, testFileno1, Function | MediumTest | Level2) ...@@ -386,7 +386,7 @@ HWTEST_F(FileSystemTest, testFileno1, Function | MediumTest | Level2)
ReadCloseTest(fd); ReadCloseTest(fd);
} }
#endif
/** /**
* @tc.number SUB_KERNEL_FS_STDIO_0700 * @tc.number SUB_KERNEL_FS_STDIO_0700
* @tc.name basic function test : Use the rename function to rename files. * @tc.name basic function test : Use the rename function to rename files.
...@@ -417,7 +417,7 @@ HWTEST_F(FileSystemTest, testRenameDir, Function | MediumTest | Level3) ...@@ -417,7 +417,7 @@ HWTEST_F(FileSystemTest, testRenameDir, Function | MediumTest | Level3)
EXPECT_NE(rename(DIR0, newDirName), -1) << "> rename errno = " << errno; EXPECT_NE(rename(DIR0, newDirName), -1) << "> rename errno = " << errno;
EXPECT_NE(rmdir(newDirName), -1) << "> rmdir errno = " << errno; EXPECT_NE(rmdir(newDirName), -1) << "> rmdir errno = " << errno;
} }
#if 0
/** /**
* @tc.number SUB_KERNEL_FS_STDIO_0800 * @tc.number SUB_KERNEL_FS_STDIO_0800
* @tc.name basic function test : Use the fflush function to refresh stream * @tc.name basic function test : Use the fflush function to refresh stream
...@@ -474,3 +474,4 @@ HWTEST_F(FileSystemTest, testFflush, Function | MediumTest | Level3) ...@@ -474,3 +474,4 @@ HWTEST_F(FileSystemTest, testFflush, Function | MediumTest | Level3)
Msleep(100); Msleep(100);
AssertProcExitedOK(pid); AssertProcExitedOK(pid);
} }
#endif
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include "libfs.h" #include "libfs.h"
using namespace testing::ext; using namespace testing::ext;
#if 0
/** /**
* @tc.number SUB_KERNEL_FS_STDLIB_0100 * @tc.number SUB_KERNEL_FS_STDLIB_0100
* @tc.name basic function test : mkstemp create a temporary file * @tc.name basic function test : mkstemp create a temporary file
...@@ -87,7 +87,7 @@ HWTEST_F(FileSystemTest, testMkostemp, Function | MediumTest | Level2) ...@@ -87,7 +87,7 @@ HWTEST_F(FileSystemTest, testMkostemp, Function | MediumTest | Level2)
ReadCloseTest(fd); ReadCloseTest(fd);
EXPECT_NE(unlink(tmpFileName), -1) << "> unlink errno = " << errno; EXPECT_NE(unlink(tmpFileName), -1) << "> unlink errno = " << errno;
} }
#endif
/** /**
* @tc.number SUB_KERNEL_FS_STDLIB_0400 * @tc.number SUB_KERNEL_FS_STDLIB_0400
* @tc.name basic function test : mktemp create a temporary file name, mkdtemp create a directory * @tc.name basic function test : mktemp create a temporary file name, mkdtemp create a directory
......
...@@ -174,7 +174,7 @@ HWTEST_F(FileSystemTest, testChdirEnotdir, Function | MediumTest | Level3) ...@@ -174,7 +174,7 @@ HWTEST_F(FileSystemTest, testChdirEnotdir, Function | MediumTest | Level3)
EXPECT_EQ(errno, ENOTDIR); EXPECT_EQ(errno, ENOTDIR);
EXPECT_NE(chdir(TOP_DIR), -1) << "> chdir errno = " << errno; EXPECT_NE(chdir(TOP_DIR), -1) << "> chdir errno = " << errno;
} }
#if 0
#if defined(LITE_FS_NFS) || defined(LITE_FS_VFAT) #if defined(LITE_FS_NFS) || defined(LITE_FS_VFAT)
/** /**
* @tc.number SUB_KERNEL_FS_UNISTD_0300 * @tc.number SUB_KERNEL_FS_UNISTD_0300
...@@ -223,7 +223,7 @@ HWTEST_F(FileSystemTest, testDup2, Function | MediumTest | Level3) ...@@ -223,7 +223,7 @@ HWTEST_F(FileSystemTest, testDup2, Function | MediumTest | Level3)
ReadCloseTest(fdNew); ReadCloseTest(fdNew);
EXPECT_NE(close(fd), -1) << "> close errno = " << errno; EXPECT_NE(close(fd), -1) << "> close errno = " << errno;
} }
#endif
#if defined(LITE_FS_VFAT) #if defined(LITE_FS_VFAT)
/** /**
* @tc.number SUB_KERNEL_FS_UNISTD_0500 * @tc.number SUB_KERNEL_FS_UNISTD_0500
......
...@@ -274,7 +274,7 @@ HWTEST_F(ProcessTest, testExit, Function | MediumTest | Level2) ...@@ -274,7 +274,7 @@ HWTEST_F(ProcessTest, testExit, Function | MediumTest | Level2)
ASSERT_EQ(exitCode, reInt[i]); ASSERT_EQ(exitCode, reInt[i]);
} }
} }
#if 0
/** /**
* @tc.number SUB_KERNEL_PROCESS_EXIT_0200 * @tc.number SUB_KERNEL_PROCESS_EXIT_0200
* @tc.name Test exit about IO flush * @tc.name Test exit about IO flush
...@@ -312,7 +312,7 @@ HWTEST_F(ProcessTest, testExitFlush, Function | MediumTest | Level3) ...@@ -312,7 +312,7 @@ HWTEST_F(ProcessTest, testExitFlush, Function | MediumTest | Level3)
EXPECT_NE(fclose(fp), -1) << "> fclose errno =" <<errno; EXPECT_NE(fclose(fp), -1) << "> fclose errno =" <<errno;
remove(testFile); remove(testFile);
} }
#endif
/** /**
* @tc.number SUB_KERNEL_PROCESS_ASSERT_0100 * @tc.number SUB_KERNEL_PROCESS_ASSERT_0100
* @tc.name Basic test about assert true * @tc.name Basic test about assert true
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册