summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Hunter <ext-adrian.hunter@nokia.com>2007-07-18 11:41:51 +0300
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2007-07-18 15:25:44 +0300
commit43e95b11417e5b61833fd9431259396f372fe3eb (patch)
treee8038760a8b93d85a9dcfe3b90da6a79d699557d
parent0d62e6a7338d8f25727f56ca14236954fc8f2cef (diff)
Amend tests not to insist that file system type is JFFS2
Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
-rw-r--r--tests/fs-tests/lib/tests.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/tests/fs-tests/lib/tests.c b/tests/fs-tests/lib/tests.c
index 2f513d7..8c34b00 100644
--- a/tests/fs-tests/lib/tests.c
+++ b/tests/fs-tests/lib/tests.c
@@ -30,9 +30,6 @@
#include <sys/vfs.h>
#include <sys/statvfs.h>
#include <linux/jffs2.h>
-#if 0
-#include <linux/jffs3.h>
-#endif
#include <libgen.h>
#include <dirent.h>
#include <ctype.h>
@@ -373,25 +370,11 @@ void tests_check_test_file_system(void)
"TEST_FILE_SYSTEM_MOUNT_DIR\n");
CHECK(0);
}
- if (strcmp(tests_file_system_type, "jffs2") != 0 &&
- strcmp(tests_file_system_type, "jffs3") != 0) {
- fprintf(stderr, "Invalid test file system type:"
- " %s\n", tests_file_system_type);
- fprintf(stderr, "Must be jffs2 or jffs3\n");
- CHECK(0);
- }
if (strcmp(tests_file_system_type, "jffs2") == 0 &&
fs_info.f_type != JFFS2_SUPER_MAGIC) {
fprintf(stderr, "File system type is not jffs2\n");
CHECK(0);
}
-#ifdef JFFS3_SUPER_MAGIC
- if (strcmp(tests_file_system_type, "jffs3") == 0 &&
- fs_info.f_type != JFFS3_SUPER_MAGIC) {
- fprintf(stderr, "File system type is not jffs3\n");
- CHECK(0);
- }
-#endif
/* Check that the test file system is not the root file system */
if (!rootok) {
CHECK(stat(tests_file_system_mount_dir, &f_info) != -1);