LU-14786 lod: create missing debugfs file

[fs/lustre-release.git] / lustre / tests / llapi_layout_test.c

diff --git a/lustre/tests/llapi_layout_test.c b/lustre/tests/llapi_layout_test.c
index 0bae91f..890dd8d 100644 (file)
--- a/lustre/tests/llapi_layout_test.c
+++ b/lustre/tests/llapi_layout_test.c
@@ -70,12 +70,14 @@ do {                                                                        \
 
 static char *lustre_dir;
 static char *poolname;
+static bool run_list_provided;
 static int num_osts = -1;
 
 void usage(char *prog)
 {
        printf("Usage: %s [-d lustre_dir] [-p pool_name] [-o num_osts] "
-              "[-s $n,$m,..]\n", prog);
+              "[-s $n,$m,... (skip tests)] [-t $n,$m,... (run tests)]\n",
+              prog);
        exit(0);
 }
 
@@ -930,7 +932,7 @@ void test21(void)
        ASSERTF(layout != NULL, "errno = %d", errno);
 
        fd = llapi_layout_file_create(template, 0, 0640, layout);
-       ASSERTF(fd == -1 && errno == ENOTTY,
+       ASSERTF(fd == -1 && errno == ENOENT,
                "fd = %d, errno = %d, template = %s", fd, errno, template);
        llapi_layout_free(layout);
 }
@@ -1364,7 +1366,7 @@ void test30(void)
        /* set non-contiguous extent will fail */
        rc = llapi_layout_comp_extent_set(layout, start[1] * 2, end[1]);
        ASSERTF(rc == 0, "errno %d", errno);
-       rc = llapi_layout_sanity(layout, false, false);
+       rc = llapi_layout_sanity(layout, NULL, false, false);
        ASSERTF(rc == 12 /*LSE_NOT_ADJACENT_PREV*/, "rc %d", rc);
 
        rc = llapi_layout_comp_extent_set(layout, start[1], end[1]);
@@ -1732,7 +1734,7 @@ void test34(void)
        layout = llapi_layout_get_by_path(path, 0);
        ASSERTF(layout != NULL, "errno = %d", errno);
 
-       rc = llapi_layout_sanity(layout, false, false);
+       rc = llapi_layout_sanity(layout, NULL, false, false);
        ASSERTF(rc == 0, "errno %d", errno);
 }
 
@@ -1802,7 +1804,8 @@ int test(void (*test_fn)(), const char *test_desc, bool test_skip, int test_num)
        char status_buf[128];
 
        if (test_skip) {
-               print_test_desc(test_num, test_desc, "skip");
+               if (!run_list_provided)
+                       print_test_desc(test_num, test_desc, "skip");
                return 0;
        }
 
@@ -1857,11 +1860,34 @@ static void set_tests_skipped(char *str_tests)
        }
 }
 
+static void set_tests_to_run(char *str_tests)
+{
+       char *ptr = str_tests;
+       int tstno;
+       int i = 0;
+
+       if (ptr == NULL || strlen(ptr) == 0)
+               return;
+
+       for (i = 0; i < NUM_TESTS ; i++)
+               test_tbl[i].tte_skip = true;
+
+       while (*ptr != '\0') {
+               tstno = strtoul(ptr, &ptr, 0);
+               if (tstno >= 0 && tstno < NUM_TESTS)
+                       test_tbl[tstno].tte_skip = false;
+               if (*ptr == ',')
+                       ptr++;
+               else
+                       break;
+       }
+}
+
 static void process_args(int argc, char *argv[])
 {
        int c;
 
-       while ((c = getopt(argc, argv, "d:p:o:s:")) != -1) {
+       while ((c = getopt(argc, argv, "d:p:o:s:t:")) != -1) {
                switch (c) {
                case 'd':
                        lustre_dir = optarg;
@@ -1875,6 +1901,10 @@ static void process_args(int argc, char *argv[])
                case 's':
                        set_tests_skipped(optarg);
                        break;
+               case 't':
+                       run_list_provided = true;
+                       set_tests_to_run(optarg);
+                       break;
                case '?':
                        fprintf(stderr, "Unknown option '%c'\n", optopt);
                        usage(argv[0]);