Merge "Enable proper compilation of aio tests."
diff --git a/Android.bp b/Android.bp
index acfcfe7..70e58b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -84,7 +84,7 @@
     static_libs: ["libcap"],
 
     // TODO: recover libaio when the external project created
-    shared_libs: ["libselinux"],
+    shared_libs: ["libselinux", "libasyncio"],
 }
 
 cc_defaults {
diff --git a/android/Android.ltp.mk b/android/Android.ltp.mk
index 3f063ab..453de2f 100644
--- a/android/Android.ltp.mk
+++ b/android/Android.ltp.mk
@@ -301,10 +301,6 @@
 module_src_files := testcases/kernel/controllers/cpuset/cpuset_load_balance_test/cpuset_load_balance_test.sh
 include $(ltp_build_prebuilt)
 
-module_prebuilt := testcases/data/file01/in.bash
-module_src_files := testcases/commands/file/datafiles/in.bash
-include $(ltp_build_prebuilt)
-
 module_prebuilt := testcases/bin/broken_ip6-plen
 module_src_files := testcases/network/stress/broken_ip/broken_ip6-plen
 include $(ltp_build_prebuilt)
@@ -325,8 +321,8 @@
 module_src_files := testcases/network/multicast/mc_member/datafiles/TooManyGroups
 include $(ltp_build_prebuilt)
 
-module_prebuilt := testcases/bin/nfs05
-module_src_files := testcases/network/nfs/nfs_stress/nfs05
+module_prebuilt := testcases/bin/macsec01.sh
+module_src_files := testcases/network/virt/macsec01.sh
 include $(ltp_build_prebuilt)
 
 module_prebuilt := testcases/bin/udp6-multi-diffport01
@@ -2373,8 +2369,8 @@
 module_src_files := testcases/network/stress/ns-tools/find_portbundle
 include $(ltp_build_prebuilt)
 
-module_prebuilt := testcases/bin/macsec01.sh
-module_src_files := testcases/network/virt/macsec01.sh
+module_prebuilt := testcases/bin/nfs05
+module_src_files := testcases/network/nfs/nfs_stress/nfs05
 include $(ltp_build_prebuilt)
 
 module_prebuilt := testcases/bin/nfs06
@@ -2501,6 +2497,10 @@
 module_src_files := testcases/network/stress/tcp/uni-dsackoff/tcp6-uni-dsackoff14
 include $(ltp_build_prebuilt)
 
+module_prebuilt := testcases/data/file01/in.bash
+module_src_files := testcases/commands/file/datafiles/in.bash
+include $(ltp_build_prebuilt)
+
 module_prebuilt := testcases/bin/tcp6-uni-sackoff06
 module_src_files := testcases/network/stress/tcp/uni-sackoff/tcp6-uni-sackoff06
 include $(ltp_build_prebuilt)
diff --git a/android/include/aio.h b/android/include/aio.h
index d92d7c6..02da639 100644
--- a/android/include/aio.h
+++ b/android/include/aio.h
@@ -3,7 +3,6 @@
 
 #include <time.h>
 #include <signal.h>
-#include <linux/aio_abi.h>
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
diff --git a/android/include/config.h b/android/include/config.h
index 4e43ad7..4fcb3a1 100644
--- a/android/include/config.h
+++ b/android/include/config.h
@@ -135,10 +135,10 @@
 /* #undef HAVE_LIBACL */
 
 /* Define to 1 if you have libaio and it's headers installed. */
-/* #undef HAVE_LIBAIO */
+#define HAVE_LIBAIO 1
 
 /* Define to 1 if you have the <libaio.h> header file. */
-/* #undef HAVE_LIBAIO_H */
+#define HAVE_LIBAIO_H 1
 
 /* Define to 1 if you have libcap-2 installed. */
 #define HAVE_LIBCAP 1
diff --git a/android/include/libaio.h b/android/include/libaio.h
new file mode 100644
index 0000000..ff04b5a
--- /dev/null
+++ b/android/include/libaio.h
@@ -0,0 +1,113 @@
+#ifndef _LIBAIO_H
+#define _LIBAIO_H
+
+// Don't include the actual header uapi/aio_abi.h
+// since libaio redefines the structs for some reason.
+// Instead override those definitions with the ones below.
+#define __LINUX__AIO_ABI_H
+
+#include <stdint.h>
+
+#if __UINTPTR_MAX__ == UINT64_MAX
+#define PADDED_PTR(x, y) x
+#elif __UINTPTR_MAX__ == UINT32_MAX
+#define PADDED_PTR(x, y) x; unsigned y
+#endif
+
+struct io_iocb_common {
+    PADDED_PTR(void *buf, __pad1);
+    __u64 nbytes;
+    __s64    offset;
+    __u64    reserved2;
+    __u32    flags;
+    __u32    resfd;
+};
+
+struct iocb {
+    PADDED_PTR(void *data, __pad1);
+    __u32 key;
+    __u32 aio_rw_flags;
+    __u16 aio_lio_opcode;
+    __s16 aio_reqprio;
+    __u32 aio_fildes;
+    union {
+        struct io_iocb_common c;
+    } u;
+};
+
+struct io_event {
+    PADDED_PTR(void *data, __pad1);
+    PADDED_PTR(struct iocb *obj, __pad2);
+    __s64 res;
+    __s64 res2;
+};
+
+typedef unsigned long io_context_t;
+typedef io_context_t aio_context_t;
+
+#include <asyncio/AsyncIO.h>
+
+#define IO_CMD_PREAD 0
+#define IO_CMD_PWRITE 1
+#define IO_CMD_FSYNC 2
+#define IO_CMD_FDSYNC 3
+#define IO_CMD_POLL 5
+#define IO_CMD_NOOP 6
+#define IO_CMD_PREADV 7
+#define IO_CMD_PWRITEV 8
+
+typedef void (*io_callback_t)(io_context_t ctx, struct iocb *iocb, long res, long res2);
+
+static inline int redirect_error(int ret) {
+    return ret == -1 ? -errno : ret;
+}
+
+// libaio doesn't follow syscall convention, so errors are returned
+// as negative values and errno isn't used.
+
+static inline int libaio_setup(int maxevents, io_context_t *ctxp) {
+    int ret = io_setup(maxevents, ctxp);
+    return redirect_error(ret);
+}
+
+static inline int libaio_destroy(io_context_t ctx) {
+    int ret = io_destroy(ctx);
+    return redirect_error(ret);
+}
+
+static inline int libaio_submit(io_context_t ctx, long nr, struct iocb *ios[]) {
+    int ret = io_submit(ctx, nr, ios);
+    return redirect_error(ret);
+}
+
+static inline int libaio_cancel(io_context_t ctx, struct iocb *iocb, struct io_event *evt) {
+    int ret = io_cancel(ctx, iocb, evt);
+    return redirect_error(ret);
+}
+
+static inline int libaio_getevents(io_context_t ctx_id, long min_nr, long nr, struct io_event *events, struct timespec *timeout) {
+    int ret = io_getevents(ctx_id, min_nr, nr, events, timeout);
+    return redirect_error(ret);
+}
+
+static inline void io_set_callback(struct iocb *iocb, io_callback_t cb)
+{
+    iocb->data = (void *)cb;
+}
+
+static inline int io_queue_init(int maxevents, io_context_t *ctxp) {
+    memset(ctxp, 0, sizeof(*ctxp));
+    return libaio_setup(maxevents, ctxp);
+}
+
+// Override the system calls with their libaio versions.
+
+#define io_setup(a, b) libaio_setup(a, b)
+#define io_destroy(a) libaio_destroy(a)
+#define io_submit(a, b, c) libaio_submit(a, b, c)
+#define io_cancel(a, b, c) libaio_cancel(a, b, c)
+#define io_getevents(a, b, c, d, e) libaio_getevents(a, b, c, d, e)
+
+#define io_queue_release(a) io_destroy(a)
+
+#endif
diff --git a/android/ltp_package_list.mk b/android/ltp_package_list.mk
index 6dd64e3..00d0918 100644
--- a/android/ltp_package_list.mk
+++ b/android/ltp_package_list.mk
@@ -530,6 +530,11 @@
   ltp_input04 \
   ltp_input05 \
   ltp_input06 \
+  ltp_io_cancel01 \
+  ltp_io_destroy01 \
+  ltp_io_getevents01 \
+  ltp_io_setup01 \
+  ltp_io_submit01 \
   ltp_iobw \
   ltp_ioctl01 \
   ltp_ioctl03 \
diff --git a/android/tools/disabled_tests.txt b/android/tools/disabled_tests.txt
index 1d7bd27..8aa1d1d 100644
--- a/android/tools/disabled_tests.txt
+++ b/android/tools/disabled_tests.txt
@@ -400,11 +400,8 @@
 eventfd01
 epoll_pwait01
 abs01
-io_setup01
 rt_sigsuspend01
-io_destroy01
 pidns12
-io_cancel01
 verify_caps_exec
 sigsuspend01
 pidns10
@@ -412,10 +409,8 @@
 atof01
 trace_sched
 nextafter01
-io_submit01
 pidns17
 pidns20
-io_getevents01
 nfs05_make_tree
 test
 check_tray
diff --git a/gen.bp b/gen.bp
index 11fbcaf..b726362 100644
--- a/gen.bp
+++ b/gen.bp
@@ -174,6 +174,22 @@
 }
 
 cc_test {
+    name: "ltp_cpuctl_test02",
+    stem: "cpuctl_test02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/controllers/cpuctl/cpuctl_test02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: [
+        "testcases/kernel/controllers/libcontrollers",
+        "include/old",
+    ],
+    static_libs: [
+        "libltp_controllers",
+        "libltp_ltp",
+    ],
+}
+
+cc_test {
     name: "ltp_overcommit_memory",
     stem: "overcommit_memory",
     defaults: ["ltp_test_defaults"],
@@ -215,12 +231,16 @@
 }
 
 cc_test {
-    name: "ltp_madvise01",
-    stem: "madvise01",
+    name: "ltp_statfs03",
+    stem: "statfs03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/madvise/madvise01.c"],
+    srcs: ["testcases/kernel/syscalls/statfs/statfs03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/statfs",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
     static_libs: ["libltp_ltp"],
 }
 
@@ -238,6 +258,16 @@
 }
 
 cc_test {
+    name: "ltp_utime06",
+    stem: "utime06",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/utime/utime06.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_asapi_01",
     stem: "asapi_01",
     defaults: ["ltp_test_defaults"],
@@ -440,6 +470,16 @@
 }
 
 cc_test {
+    name: "ltp_sched_setattr01",
+    stem: "sched_setattr01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/sched_setattr/sched_setattr01.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_futex_wait03",
     stem: "futex_wait03",
     defaults: ["ltp_test_defaults"],
@@ -536,10 +576,20 @@
 }
 
 cc_test {
-    name: "ltp_setegid01",
-    stem: "setegid01",
+    name: "ltp_link02",
+    stem: "link02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/setegid/setegid01.c"],
+    srcs: ["testcases/kernel/syscalls/link/link02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_sched_getparam03",
+    stem: "sched_getparam03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/sched_getparam/sched_getparam03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -576,16 +626,6 @@
 }
 
 cc_test {
-    name: "ltp_fs_fill",
-    stem: "fs_fill",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/fs/fs_fill/fs_fill.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_vma05_vdso",
     stem: "vma05_vdso",
     defaults: ["ltp_test_defaults"],
@@ -624,10 +664,10 @@
 }
 
 cc_test {
-    name: "ltp_getdents01",
-    stem: "getdents01",
+    name: "ltp_ptrace02",
+    stem: "ptrace02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getdents/getdents01.c"],
+    srcs: ["testcases/kernel/syscalls/ptrace/ptrace02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -748,10 +788,10 @@
 }
 
 cc_test {
-    name: "ltp_renameat201",
-    stem: "renameat201",
+    name: "ltp_epoll_create1_01",
+    stem: "epoll_create1_01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/renameat2/renameat201.c"],
+    srcs: ["testcases/kernel/syscalls/epoll_create1/epoll_create1_01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -826,10 +866,10 @@
 }
 
 cc_test {
-    name: "ltp_unlink07",
-    stem: "unlink07",
+    name: "ltp_open09",
+    stem: "open09",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/unlink/unlink07.c"],
+    srcs: ["testcases/kernel/syscalls/open/open09.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -849,10 +889,10 @@
 }
 
 cc_test {
-    name: "ltp_unlink06",
-    stem: "unlink06",
+    name: "ltp_open08",
+    stem: "open08",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/unlink/unlink06.c"],
+    srcs: ["testcases/kernel/syscalls/open/open08.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -869,6 +909,16 @@
 }
 
 cc_test {
+    name: "ltp_modify_ldt03",
+    stem: "modify_ldt03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/modify_ldt/modify_ldt03.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_readdir02",
     stem: "readdir02",
     defaults: ["ltp_test_defaults"],
@@ -879,10 +929,10 @@
 }
 
 cc_test {
-    name: "ltp_quotactl01",
-    stem: "quotactl01",
+    name: "ltp_unlink05",
+    stem: "unlink05",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/quotactl/quotactl01.c"],
+    srcs: ["testcases/kernel/syscalls/unlink/unlink05.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -899,16 +949,6 @@
 }
 
 cc_test {
-    name: "ltp_uaccess",
-    stem: "uaccess",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/device-drivers/uaccess/uaccess.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_setsid01",
     stem: "setsid01",
     defaults: ["ltp_test_defaults"],
@@ -1104,16 +1144,34 @@
 }
 
 cc_test {
-    name: "ltp_umount01",
-    stem: "umount01",
+    name: "ltp_open01",
+    stem: "open01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/umount/umount01.c"],
+    srcs: ["testcases/kernel/syscalls/open/open01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
+    name: "ltp_vma04",
+    stem: "vma04",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/mem/vma/vma04.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: [
+        "testcases/kernel/mem/include",
+        "testcases/kernel/include",
+        "include/old",
+    ],
+    static_libs: [
+        "libltp_mem",
+        "libltp_kerntest",
+        "libltp_ltp",
+    ],
+}
+
+cc_test {
     name: "ltp_readlink01",
     stem: "readlink01",
     defaults: ["ltp_test_defaults"],
@@ -1183,6 +1241,16 @@
 }
 
 cc_test {
+    name: "ltp_pause02",
+    stem: "pause02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/pause/pause02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_gentanh",
     stem: "gentanh",
     defaults: ["ltp_test_defaults"],
@@ -1192,16 +1260,6 @@
 }
 
 cc_test {
-    name: "ltp_umount03",
-    stem: "umount03",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/umount/umount03.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_thp02",
     stem: "thp02",
     defaults: ["ltp_test_defaults"],
@@ -1230,10 +1288,10 @@
 }
 
 cc_test {
-    name: "ltp_umount02",
-    stem: "umount02",
+    name: "ltp_open02",
+    stem: "open02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/umount/umount02.c"],
+    srcs: ["testcases/kernel/syscalls/open/open02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -1370,20 +1428,6 @@
 }
 
 cc_test {
-    name: "ltp_sendfile02",
-    stem: "sendfile02",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sendfile/sendfile02.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/sendfile",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_hangup01",
     stem: "hangup01",
     defaults: ["ltp_test_defaults"],
@@ -1485,16 +1529,6 @@
 }
 
 cc_test {
-    name: "ltp_mkdir01",
-    stem: "mkdir01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mkdir/mkdir01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_uname01",
     stem: "uname01",
     defaults: ["ltp_test_defaults"],
@@ -1569,10 +1603,10 @@
 }
 
 cc_test {
-    name: "ltp_iopl01",
-    stem: "iopl01",
+    name: "ltp_getpriority01",
+    stem: "getpriority01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/iopl/iopl01.c"],
+    srcs: ["testcases/kernel/syscalls/getpriority/getpriority01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -1598,10 +1632,10 @@
 }
 
 cc_test {
-    name: "ltp_iopl02",
-    stem: "iopl02",
+    name: "ltp_getpriority02",
+    stem: "getpriority02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/iopl/iopl02.c"],
+    srcs: ["testcases/kernel/syscalls/getpriority/getpriority02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -1651,10 +1685,23 @@
 }
 
 cc_test {
-    name: "ltp_keyctl04",
-    stem: "keyctl04",
+    name: "ltp_inode02",
+    stem: "inode02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/keyctl/keyctl04.c"],
+    srcs: ["testcases/kernel/fs/inode/inode02.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-DLINUX",
+    ],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_send01",
+    stem: "send01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/send/send01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -1715,16 +1762,6 @@
 }
 
 cc_test {
-    name: "ltp_ptrace02",
-    stem: "ptrace02",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/ptrace/ptrace02.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_vmsplice01",
     stem: "vmsplice01",
     defaults: ["ltp_test_defaults"],
@@ -1925,16 +1962,6 @@
 }
 
 cc_test {
-    name: "ltp_sched_get_priority_max02",
-    stem: "sched_get_priority_max02",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_chroot04",
     stem: "chroot04",
     defaults: ["ltp_test_defaults"],
@@ -1945,10 +1972,10 @@
 }
 
 cc_test {
-    name: "ltp_memcpy01",
-    stem: "memcpy01",
+    name: "ltp_tst_net_iface_prefix",
+    stem: "tst_net_iface_prefix",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/memcpy/memcpy01.c"],
+    srcs: ["testcases/lib/tst_net_iface_prefix.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -1988,10 +2015,10 @@
 }
 
 cc_test {
-    name: "ltp_modify_ldt03",
-    stem: "modify_ldt03",
+    name: "ltp_mmap14",
+    stem: "mmap14",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/modify_ldt/modify_ldt03.c"],
+    srcs: ["testcases/kernel/syscalls/mmap/mmap14.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -2044,6 +2071,16 @@
 }
 
 cc_test {
+    name: "ltp_clone05",
+    stem: "clone05",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/clone/clone05.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getsid02",
     stem: "getsid02",
     defaults: ["ltp_test_defaults"],
@@ -2160,10 +2197,10 @@
 }
 
 cc_test {
-    name: "ltp_read02",
-    stem: "read02",
+    name: "ltp_pm_get_sched_values",
+    stem: "pm_get_sched_values",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/read/read02.c"],
+    srcs: ["testcases/kernel/power_management/pm_get_sched_values.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -2198,16 +2235,6 @@
 }
 
 cc_test {
-    name: "ltp_send01",
-    stem: "send01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/send/send01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_brk01",
     stem: "brk01",
     defaults: ["ltp_test_defaults"],
@@ -2228,6 +2255,16 @@
 }
 
 cc_test {
+    name: "ltp_symlink04",
+    stem: "symlink04",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/symlink/symlink04.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_ext4_file_time",
     stem: "ext4_file_time",
     defaults: ["ltp_test_defaults"],
@@ -2248,16 +2285,6 @@
 }
 
 cc_test {
-    name: "ltp_sched_setattr01",
-    stem: "sched_setattr01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sched_setattr/sched_setattr01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_setpgid03",
     stem: "setpgid03",
     defaults: ["ltp_test_defaults"],
@@ -2278,6 +2305,16 @@
 }
 
 cc_test {
+    name: "ltp_signal02",
+    stem: "signal02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/signal/signal02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_gettimeofday01",
     stem: "gettimeofday01",
     defaults: ["ltp_test_defaults"],
@@ -2308,16 +2345,6 @@
 }
 
 cc_test {
-    name: "ltp_inotify06",
-    stem: "inotify06",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/inotify/inotify06.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_cpuctl_test04",
     stem: "cpuctl_test04",
     defaults: ["ltp_test_defaults"],
@@ -2384,16 +2411,6 @@
 }
 
 cc_test {
-    name: "ltp_keyctl01",
-    stem: "keyctl01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/keyctl/keyctl01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_fpathconf01",
     stem: "fpathconf01",
     defaults: ["ltp_test_defaults"],
@@ -2404,20 +2421,10 @@
 }
 
 cc_test {
-    name: "ltp_alarm01",
-    stem: "alarm01",
+    name: "ltp_uaccess",
+    stem: "uaccess",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/alarm/alarm01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
-    name: "ltp_sched_getattr02",
-    stem: "sched_getattr02",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sched_getattr/sched_getattr02.c"],
+    srcs: ["testcases/kernel/device-drivers/uaccess/uaccess.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -2434,19 +2441,13 @@
 }
 
 cc_test {
-    name: "ltp_cpuctl_test02",
-    stem: "cpuctl_test02",
+    name: "ltp_pause01",
+    stem: "pause01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/controllers/cpuctl/cpuctl_test02.c"],
+    srcs: ["testcases/kernel/syscalls/pause/pause01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/controllers/libcontrollers",
-        "include/old",
-    ],
-    static_libs: [
-        "libltp_controllers",
-        "libltp_ltp",
-    ],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
 }
 
 cc_test {
@@ -2460,10 +2461,10 @@
 }
 
 cc_test {
-    name: "ltp_rmdir04",
-    stem: "rmdir04",
+    name: "ltp_open03",
+    stem: "open03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/rmdir/rmdir04.c"],
+    srcs: ["testcases/kernel/syscalls/open/open03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -2568,19 +2569,6 @@
 }
 
 cc_test {
-    name: "ltp_ptem01",
-    stem: "ptem01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/pty/ptem01.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_GNU_SOURCE",
-    ],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_genfrexp",
     stem: "genfrexp",
     defaults: ["ltp_test_defaults"],
@@ -2590,10 +2578,10 @@
 }
 
 cc_test {
-    name: "ltp_capget01",
-    stem: "capget01",
+    name: "ltp_fanotify05",
+    stem: "fanotify05",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/capget/capget01.c"],
+    srcs: ["testcases/kernel/syscalls/fanotify/fanotify05.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -2613,10 +2601,10 @@
 }
 
 cc_test {
-    name: "ltp_capget02",
-    stem: "capget02",
+    name: "ltp_fanotify06",
+    stem: "fanotify06",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/capget/capget02.c"],
+    srcs: ["testcases/kernel/syscalls/fanotify/fanotify06.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -2674,16 +2662,6 @@
 }
 
 cc_test {
-    name: "ltp_fdatasync02",
-    stem: "fdatasync02",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fdatasync/fdatasync02.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_fanotify08",
     stem: "fanotify08",
     defaults: ["ltp_test_defaults"],
@@ -2876,16 +2854,6 @@
 }
 
 cc_test {
-    name: "ltp_tst_net_iface_prefix",
-    stem: "tst_net_iface_prefix",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/lib/tst_net_iface_prefix.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_stack_clash",
     stem: "stack_clash",
     defaults: ["ltp_test_defaults"],
@@ -2960,6 +2928,19 @@
 }
 
 cc_test {
+    name: "ltp_dirty",
+    stem: "dirty",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/io/ltp-aiodio/dirty.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-DAIO",
+    ],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_mmapstress09",
     stem: "mmapstress09",
     defaults: ["ltp_test_defaults"],
@@ -2970,10 +2951,10 @@
 }
 
 cc_test {
-    name: "ltp_mmapstress08",
-    stem: "mmapstress08",
+    name: "ltp_mincore02",
+    stem: "mincore02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/mem/mmapstress/mmapstress08.c"],
+    srcs: ["testcases/kernel/syscalls/mincore/mincore02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -3030,10 +3011,10 @@
 }
 
 cc_test {
-    name: "ltp_process_vm01",
-    stem: "process_vm01",
+    name: "ltp_inotify06",
+    stem: "inotify06",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/cma/process_vm01.c"],
+    srcs: ["testcases/kernel/syscalls/inotify/inotify06.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -3070,19 +3051,12 @@
 }
 
 cc_test {
-    name: "ltp_fcntl31",
-    stem: "fcntl31",
+    name: "ltp_inotify02",
+    stem: "inotify02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fcntl/fcntl31.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_GNU_SOURCE",
-    ],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/fcntl",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
+    srcs: ["testcases/kernel/syscalls/inotify/inotify02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
@@ -3133,12 +3107,19 @@
 }
 
 cc_test {
-    name: "ltp_write05",
-    stem: "write05",
+    name: "ltp_fcntl31",
+    stem: "fcntl31",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/write/write05.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
+    srcs: ["testcases/kernel/syscalls/fcntl/fcntl31.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_GNU_SOURCE",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/fcntl",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
     static_libs: ["libltp_ltp"],
 }
 
@@ -3231,19 +3212,12 @@
 }
 
 cc_test {
-    name: "ltp_fcntl10",
-    stem: "fcntl10",
+    name: "ltp_alarm01",
+    stem: "alarm01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fcntl/fcntl10.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_GNU_SOURCE",
-    ],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/fcntl",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
+    srcs: ["testcases/kernel/syscalls/alarm/alarm01.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
@@ -3346,10 +3320,10 @@
 }
 
 cc_test {
-    name: "ltp_sched_getparam03",
-    stem: "sched_getparam03",
+    name: "ltp_setegid01",
+    stem: "setegid01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sched_getparam/sched_getparam03.c"],
+    srcs: ["testcases/kernel/syscalls/setegid/setegid01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -3454,10 +3428,10 @@
 }
 
 cc_test {
-    name: "ltp_write03",
-    stem: "write03",
+    name: "ltp_capget01",
+    stem: "capget01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/write/write03.c"],
+    srcs: ["testcases/kernel/syscalls/capget/capget01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -3524,13 +3498,12 @@
 }
 
 cc_test {
-    name: "ltp_flock06",
-    stem: "flock06",
+    name: "ltp_gensinh",
+    stem: "gensinh",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/flock/flock06.c"],
+    srcs: ["testcases/misc/math/float/iperb/gensinh.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
 }
 
 cc_test {
@@ -3573,20 +3546,20 @@
 }
 
 cc_test {
-    name: "ltp_mknodat01",
-    stem: "mknodat01",
+    name: "ltp_dup205",
+    stem: "dup205",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mknodat/mknodat01.c"],
+    srcs: ["testcases/kernel/syscalls/dup2/dup205.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_mknod06",
-    stem: "mknod06",
+    name: "ltp_mknodat01",
+    stem: "mknodat01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mknod/mknod06.c"],
+    srcs: ["testcases/kernel/syscalls/mknodat/mknodat01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -3743,6 +3716,16 @@
 }
 
 cc_test {
+    name: "ltp_io_setup01",
+    stem: "io_setup01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/io_setup/io_setup01.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_pth_str02",
     stem: "pth_str02",
     defaults: ["ltp_test_defaults"],
@@ -3842,10 +3825,10 @@
 }
 
 cc_test {
-    name: "ltp_getxattr02",
-    stem: "getxattr02",
+    name: "ltp_getsockopt02",
+    stem: "getsockopt02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getxattr/getxattr02.c"],
+    srcs: ["testcases/kernel/syscalls/getsockopt/getsockopt02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -3875,24 +3858,21 @@
 }
 
 cc_test {
-    name: "ltp_getxattr01",
-    stem: "getxattr01",
+    name: "ltp_getsockopt01",
+    stem: "getsockopt01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getxattr/getxattr01.c"],
+    srcs: ["testcases/kernel/syscalls/getsockopt/getsockopt01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_page02",
-    stem: "page02",
+    name: "ltp_capget02",
+    stem: "capget02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/mem/page/page02.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-DLINUX",
-    ],
+    srcs: ["testcases/kernel/syscalls/capget/capget02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
@@ -3965,10 +3945,10 @@
 }
 
 cc_test {
-    name: "ltp_syslogtst",
-    stem: "syslogtst",
+    name: "ltp_rmdir04",
+    stem: "rmdir04",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/syslog/syslogtst.c"],
+    srcs: ["testcases/kernel/syscalls/rmdir/rmdir04.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -3984,10 +3964,10 @@
 }
 
 cc_test {
-    name: "ltp_readlink02",
-    stem: "readlink02",
+    name: "ltp_timerfd_create01",
+    stem: "timerfd_create01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/readlink/readlink02.c"],
+    srcs: ["testcases/kernel/syscalls/timerfd/timerfd_create01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -4004,30 +3984,30 @@
 }
 
 cc_test {
-    name: "ltp_open09",
-    stem: "open09",
+    name: "ltp_quotactl03",
+    stem: "quotactl03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/open/open09.c"],
+    srcs: ["testcases/kernel/syscalls/quotactl/quotactl03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_open08",
-    stem: "open08",
+    name: "ltp_quotactl02",
+    stem: "quotactl02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/open/open08.c"],
+    srcs: ["testcases/kernel/syscalls/quotactl/quotactl02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_unlink05",
-    stem: "unlink05",
+    name: "ltp_quotactl01",
+    stem: "quotactl01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/unlink/unlink05.c"],
+    srcs: ["testcases/kernel/syscalls/quotactl/quotactl01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -4074,10 +4054,10 @@
 }
 
 cc_test {
-    name: "ltp_open01",
-    stem: "open01",
+    name: "ltp_umount01",
+    stem: "umount01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/open/open01.c"],
+    srcs: ["testcases/kernel/syscalls/umount/umount01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -4100,20 +4080,20 @@
 }
 
 cc_test {
-    name: "ltp_open03",
-    stem: "open03",
+    name: "ltp_umount03",
+    stem: "umount03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/open/open03.c"],
+    srcs: ["testcases/kernel/syscalls/umount/umount03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_open02",
-    stem: "open02",
+    name: "ltp_umount02",
+    stem: "umount02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/open/open02.c"],
+    srcs: ["testcases/kernel/syscalls/umount/umount02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -4243,6 +4223,16 @@
 }
 
 cc_test {
+    name: "ltp_write05",
+    stem: "write05",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/write/write05.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setrlimit01",
     stem: "setrlimit01",
     defaults: ["ltp_test_defaults"],
@@ -4303,10 +4293,20 @@
 }
 
 cc_test {
-    name: "ltp_symlink02",
-    stem: "symlink02",
+    name: "ltp_io_destroy01",
+    stem: "io_destroy01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/symlink/symlink02.c"],
+    srcs: ["testcases/kernel/syscalls/io_destroy/io_destroy01.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_mkdir01",
+    stem: "mkdir01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/mkdir/mkdir01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -4323,10 +4323,10 @@
 }
 
 cc_test {
-    name: "ltp_symlink04",
-    stem: "symlink04",
+    name: "ltp_memcpy01",
+    stem: "memcpy01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/symlink/symlink04.c"],
+    srcs: ["testcases/kernel/syscalls/memcpy/memcpy01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -4511,16 +4511,6 @@
 }
 
 cc_test {
-    name: "ltp_eventfd2_03",
-    stem: "eventfd2_03",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/eventfd2/eventfd2_03.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_mmap03",
     stem: "mmap03",
     defaults: ["ltp_test_defaults"],
@@ -4551,16 +4541,6 @@
 }
 
 cc_test {
-    name: "ltp_sysfs01",
-    stem: "sysfs01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sysfs/sysfs01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_newuname01",
     stem: "newuname01",
     defaults: ["ltp_test_defaults"],
@@ -4611,10 +4591,20 @@
 }
 
 cc_test {
-    name: "ltp_select02",
-    stem: "select02",
+    name: "ltp_execle01",
+    stem: "execle01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/select/select02.c"],
+    srcs: ["testcases/kernel/syscalls/execle/execle01.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_syslogtst",
+    stem: "syslogtst",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/syslog/syslogtst.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -4733,24 +4723,6 @@
 }
 
 cc_test {
-    name: "ltp_vma04",
-    stem: "vma04",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/mem/vma/vma04.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/mem/include",
-        "testcases/kernel/include",
-        "include/old",
-    ],
-    static_libs: [
-        "libltp_mem",
-        "libltp_kerntest",
-        "libltp_ltp",
-    ],
-}
-
-cc_test {
     name: "ltp_ltpClient",
     stem: "ltpClient",
     defaults: ["ltp_test_defaults"],
@@ -4866,20 +4838,10 @@
 }
 
 cc_test {
-    name: "ltp_fanotify06",
-    stem: "fanotify06",
+    name: "ltp_alarm02",
+    stem: "alarm02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fanotify/fanotify06.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
-    name: "ltp_socketcall02",
-    stem: "socketcall02",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/socketcall/socketcall02.c"],
+    srcs: ["testcases/kernel/syscalls/alarm/alarm02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -4925,6 +4887,16 @@
 }
 
 cc_test {
+    name: "ltp_create_short_dirs",
+    stem: "create_short_dirs",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/fs/ext4-new-features/ext4-subdir-limit/create_short_dirs.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_execlp01_child",
     stem: "execlp01_child",
     defaults: ["ltp_test_defaults"],
@@ -4974,16 +4946,6 @@
 }
 
 cc_test {
-    name: "ltp_sethostname02",
-    stem: "sethostname02",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sethostname/sethostname02.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_mount05",
     stem: "mount05",
     defaults: ["ltp_test_defaults"],
@@ -5010,10 +4972,10 @@
 }
 
 cc_test {
-    name: "ltp_utime03",
-    stem: "utime03",
+    name: "ltp_memcmp01",
+    stem: "memcmp01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/utime/utime03.c"],
+    srcs: ["testcases/kernel/syscalls/memcmp/memcmp01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -5119,20 +5081,20 @@
 }
 
 cc_test {
-    name: "ltp_mincore02",
-    stem: "mincore02",
+    name: "ltp_clone02",
+    stem: "clone02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mincore/mincore02.c"],
+    srcs: ["testcases/kernel/syscalls/clone/clone02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_clone05",
-    stem: "clone05",
+    name: "ltp_io_submit01",
+    stem: "io_submit01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/clone/clone05.c"],
+    srcs: ["testcases/kernel/syscalls/io_submit/io_submit01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -5568,19 +5530,6 @@
 }
 
 cc_test {
-    name: "ltp_sigwaitinfo01",
-    stem: "sigwaitinfo01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-DTEST_SIGWAITINFO",
-    ],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_nfs01_open_files",
     stem: "nfs01_open_files",
     defaults: ["ltp_test_defaults"],
@@ -5747,10 +5696,10 @@
 }
 
 cc_test {
-    name: "ltp_fchmod02",
-    stem: "fchmod02",
+    name: "ltp_writev02",
+    stem: "writev02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fchmod/fchmod02.c"],
+    srcs: ["testcases/kernel/syscalls/writev/writev02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -5879,6 +5828,16 @@
 }
 
 cc_test {
+    name: "ltp_write03",
+    stem: "write03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/write/write03.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_writev05",
     stem: "writev05",
     defaults: ["ltp_test_defaults"],
@@ -5899,10 +5858,10 @@
 }
 
 cc_test {
-    name: "ltp_fchmod04",
-    stem: "fchmod04",
+    name: "ltp_sched_get_priority_max02",
+    stem: "sched_get_priority_max02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fchmod/fchmod04.c"],
+    srcs: ["testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -5929,6 +5888,19 @@
 }
 
 cc_test {
+    name: "ltp_page02",
+    stem: "page02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/mem/page/page02.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-DLINUX",
+    ],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_times01",
     stem: "times01",
     defaults: ["ltp_test_defaults"],
@@ -6325,10 +6297,10 @@
 }
 
 cc_test {
-    name: "ltp_readv01",
-    stem: "readv01",
+    name: "ltp_keyctl01",
+    stem: "keyctl01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/readv/readv01.c"],
+    srcs: ["testcases/kernel/syscalls/keyctl/keyctl01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -6365,10 +6337,10 @@
 }
 
 cc_test {
-    name: "ltp_timerfd_create01",
-    stem: "timerfd_create01",
+    name: "ltp_keyctl04",
+    stem: "keyctl04",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/timerfd/timerfd_create01.c"],
+    srcs: ["testcases/kernel/syscalls/keyctl/keyctl04.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -6430,13 +6402,19 @@
 }
 
 cc_test {
-    name: "ltp_quotactl03",
-    stem: "quotactl03",
+    name: "ltp_cpuctl_latency_test",
+    stem: "cpuctl_latency_test",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/quotactl/quotactl03.c"],
+    srcs: ["testcases/kernel/controllers/cpuctl/cpuctl_latency_test.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    local_include_dirs: [
+        "testcases/kernel/controllers/libcontrollers",
+        "include/old",
+    ],
+    static_libs: [
+        "libltp_controllers",
+        "libltp_ltp",
+    ],
 }
 
 cc_test {
@@ -6450,10 +6428,20 @@
 }
 
 cc_test {
-    name: "ltp_flistxattr02",
-    stem: "flistxattr02",
+    name: "ltp_symlink02",
+    stem: "symlink02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/flistxattr/flistxattr02.c"],
+    srcs: ["testcases/kernel/syscalls/symlink/symlink02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_io_cancel01",
+    stem: "io_cancel01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/io_cancel/io_cancel01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -6590,20 +6578,20 @@
 }
 
 cc_test {
-    name: "ltp_getsockopt02",
-    stem: "getsockopt02",
+    name: "ltp_getxattr02",
+    stem: "getxattr02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getsockopt/getsockopt02.c"],
+    srcs: ["testcases/kernel/syscalls/getxattr/getxattr02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_getsockopt01",
-    stem: "getsockopt01",
+    name: "ltp_getxattr01",
+    stem: "getxattr01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getsockopt/getsockopt01.c"],
+    srcs: ["testcases/kernel/syscalls/getxattr/getxattr01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -6619,6 +6607,16 @@
 }
 
 cc_test {
+    name: "ltp_select02",
+    stem: "select02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/select/select02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getxattr04",
     stem: "getxattr04",
     defaults: ["ltp_test_defaults"],
@@ -6659,23 +6657,31 @@
 }
 
 cc_test {
-    name: "ltp_memcmp01",
-    stem: "memcmp01",
+    name: "ltp_setsockopt01",
+    stem: "setsockopt01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/memcmp/memcmp01.c"],
+    srcs: ["testcases/kernel/syscalls/setsockopt/setsockopt01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_mmapstress06",
-    stem: "mmapstress06",
+    name: "ltp_min_free_kbytes",
+    stem: "min_free_kbytes",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/mem/mmapstress/mmapstress06.c"],
+    srcs: ["testcases/kernel/mem/tunable/min_free_kbytes.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    local_include_dirs: [
+        "testcases/kernel/mem/include",
+        "testcases/kernel/include",
+        "include/old",
+    ],
+    static_libs: [
+        "libltp_mem",
+        "libltp_kerntest",
+        "libltp_ltp",
+    ],
 }
 
 cc_test {
@@ -6836,10 +6842,10 @@
 }
 
 cc_test {
-    name: "ltp_utime06",
-    stem: "utime06",
+    name: "ltp_madvise01",
+    stem: "madvise01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/utime/utime06.c"],
+    srcs: ["testcases/kernel/syscalls/madvise/madvise01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -6884,11 +6890,14 @@
 }
 
 cc_test {
-    name: "ltp_mincore01",
-    stem: "mincore01",
+    name: "ltp_sigwait01",
+    stem: "sigwait01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mincore/mincore01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
+    srcs: ["testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-DTEST_SIGWAIT",
+    ],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
@@ -7039,10 +7048,10 @@
 }
 
 cc_test {
-    name: "ltp_clone02",
-    stem: "clone02",
+    name: "ltp_sethostname02",
+    stem: "sethostname02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/clone/clone02.c"],
+    srcs: ["testcases/kernel/syscalls/sethostname/sethostname02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -7082,6 +7091,16 @@
 }
 
 cc_test {
+    name: "ltp_flistxattr02",
+    stem: "flistxattr02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/flistxattr/flistxattr02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_flistxattr01",
     stem: "flistxattr01",
     defaults: ["ltp_test_defaults"],
@@ -7102,24 +7121,6 @@
 }
 
 cc_test {
-    name: "ltp_ksm03",
-    stem: "ksm03",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/mem/ksm/ksm03.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/mem/include",
-        "testcases/kernel/include",
-        "include/old",
-    ],
-    static_libs: [
-        "libltp_mem",
-        "libltp_kerntest",
-        "libltp_ltp",
-    ],
-}
-
-cc_test {
     name: "ltp_fchdir03",
     stem: "fchdir03",
     defaults: ["ltp_test_defaults"],
@@ -7150,10 +7151,10 @@
 }
 
 cc_test {
-    name: "ltp_read01",
-    stem: "read01",
+    name: "ltp_ppoll01",
+    stem: "ppoll01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/read/read01.c"],
+    srcs: ["testcases/kernel/syscalls/ppoll/ppoll01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -7197,13 +7198,21 @@
 }
 
 cc_test {
-    name: "ltp_fanotify05",
-    stem: "fanotify05",
+    name: "ltp_ksm03",
+    stem: "ksm03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fanotify/fanotify05.c"],
+    srcs: ["testcases/kernel/mem/ksm/ksm03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    local_include_dirs: [
+        "testcases/kernel/mem/include",
+        "testcases/kernel/include",
+        "include/old",
+    ],
+    static_libs: [
+        "libltp_mem",
+        "libltp_kerntest",
+        "libltp_ltp",
+    ],
 }
 
 cc_test {
@@ -7446,22 +7455,26 @@
 }
 
 cc_test {
-    name: "ltp_inotify02",
-    stem: "inotify02",
+    name: "ltp_mknod06",
+    stem: "mknod06",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/inotify/inotify02.c"],
+    srcs: ["testcases/kernel/syscalls/mknod/mknod06.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_lseek01",
-    stem: "lseek01",
+    name: "ltp_sendfile09",
+    stem: "sendfile09",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/lseek/lseek01.c"],
+    srcs: ["testcases/kernel/syscalls/sendfile/sendfile09.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/sendfile",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
     static_libs: ["libltp_ltp"],
 }
 
@@ -7628,10 +7641,10 @@
 }
 
 cc_test {
-    name: "ltp_signal05",
-    stem: "signal05",
+    name: "ltp_waitpid11",
+    stem: "waitpid11",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/signal/signal05.c"],
+    srcs: ["testcases/kernel/syscalls/waitpid/waitpid11.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -7837,6 +7850,16 @@
 }
 
 cc_test {
+    name: "ltp_mmstress",
+    stem: "mmstress",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/mem/mtest05/mmstress.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_recvmsg03",
     stem: "recvmsg03",
     defaults: ["ltp_test_defaults"],
@@ -7961,10 +7984,10 @@
 }
 
 cc_test {
-    name: "ltp_pause01",
-    stem: "pause01",
+    name: "ltp_tkill01",
+    stem: "tkill01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/pause/pause01.c"],
+    srcs: ["testcases/kernel/syscalls/tkill/tkill01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -7981,10 +8004,10 @@
 }
 
 cc_test {
-    name: "ltp_pause02",
-    stem: "pause02",
+    name: "ltp_tkill02",
+    stem: "tkill02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/pause/pause02.c"],
+    srcs: ["testcases/kernel/syscalls/tkill/tkill02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -8001,10 +8024,10 @@
 }
 
 cc_test {
-    name: "ltp_mmap14",
-    stem: "mmap14",
+    name: "ltp_mprotect01",
+    stem: "mprotect01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mmap/mmap14.c"],
+    srcs: ["testcases/kernel/syscalls/mprotect/mprotect01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -8021,10 +8044,20 @@
 }
 
 cc_test {
-    name: "ltp_mmap16",
-    stem: "mmap16",
+    name: "ltp_mprotect03",
+    stem: "mprotect03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mmap/mmap16.c"],
+    srcs: ["testcases/kernel/syscalls/mprotect/mprotect03.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_mprotect02",
+    stem: "mprotect02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/mprotect/mprotect02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -8041,10 +8074,10 @@
 }
 
 cc_test {
-    name: "ltp_mmap11",
-    stem: "mmap11",
+    name: "ltp_mprotect04",
+    stem: "mprotect04",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mmap/mmap11.c"],
+    srcs: ["testcases/kernel/syscalls/mprotect/mprotect04.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -8091,6 +8124,16 @@
 }
 
 cc_test {
+    name: "ltp_utime03",
+    stem: "utime03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/utime/utime03.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_getresgid02",
     stem: "getresgid02",
     defaults: ["ltp_test_defaults"],
@@ -8101,10 +8144,10 @@
 }
 
 cc_test {
-    name: "ltp_check_keepcaps",
-    stem: "check_keepcaps",
+    name: "ltp_fchmod04",
+    stem: "fchmod04",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/security/securebits/check_keepcaps.c"],
+    srcs: ["testcases/kernel/syscalls/fchmod/fchmod04.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -8151,6 +8194,16 @@
 }
 
 cc_test {
+    name: "ltp_unlink07",
+    stem: "unlink07",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/unlink/unlink07.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_ftruncate02",
     stem: "ftruncate02",
     defaults: ["ltp_test_defaults"],
@@ -8175,6 +8228,23 @@
 }
 
 cc_test {
+    name: "ltp_fcntl10",
+    stem: "fcntl10",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/fcntl/fcntl10.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_GNU_SOURCE",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/fcntl",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_cap_bounds_r",
     stem: "cap_bounds_r",
     defaults: ["ltp_test_defaults"],
@@ -8198,19 +8268,6 @@
 }
 
 cc_test {
-    name: "ltp_clock_getres01",
-    stem: "clock_getres01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/clock_getres/clock_getres01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_iogen",
     stem: "iogen",
     defaults: ["ltp_test_defaults"],
@@ -8239,20 +8296,10 @@
 }
 
 cc_test {
-    name: "ltp_lgetxattr02",
-    stem: "lgetxattr02",
+    name: "ltp_fs_fill",
+    stem: "fs_fill",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/lgetxattr/lgetxattr02.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
-    name: "ltp_mprotect01",
-    stem: "mprotect01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mprotect/mprotect01.c"],
+    srcs: ["testcases/kernel/fs/fs_fill/fs_fill.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -8269,24 +8316,6 @@
 }
 
 cc_test {
-    name: "ltp_thp01",
-    stem: "thp01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/mem/thp/thp01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/mem/include",
-        "testcases/kernel/include",
-        "include/old",
-    ],
-    static_libs: [
-        "libltp_mem",
-        "libltp_kerntest",
-        "libltp_ltp",
-    ],
-}
-
-cc_test {
     name: "ltp_ltp-diorh",
     stem: "ltp-diorh",
     defaults: ["ltp_test_defaults"],
@@ -8300,10 +8329,10 @@
 }
 
 cc_test {
-    name: "ltp_epoll_create1_01",
-    stem: "epoll_create1_01",
+    name: "ltp_renameat201",
+    stem: "renameat201",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/epoll_create1/epoll_create1_01.c"],
+    srcs: ["testcases/kernel/syscalls/renameat2/renameat201.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -8320,6 +8349,16 @@
 }
 
 cc_test {
+    name: "ltp_unlink06",
+    stem: "unlink06",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/unlink/unlink06.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_pwrite04",
     stem: "pwrite04",
     defaults: ["ltp_test_defaults"],
@@ -8461,10 +8500,10 @@
 }
 
 cc_test {
-    name: "ltp_setitimer03",
-    stem: "setitimer03",
+    name: "ltp_access03",
+    stem: "access03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/setitimer/setitimer03.c"],
+    srcs: ["testcases/kernel/syscalls/access/access03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -8491,20 +8530,6 @@
 }
 
 cc_test {
-    name: "ltp_statfs03",
-    stem: "statfs03",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/statfs/statfs03.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/statfs",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_access02",
     stem: "access02",
     defaults: ["ltp_test_defaults"],
@@ -8535,6 +8560,16 @@
 }
 
 cc_test {
+    name: "ltp_check_keepcaps",
+    stem: "check_keepcaps",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/security/securebits/check_keepcaps.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_ioperm02",
     stem: "ioperm02",
     defaults: ["ltp_test_defaults"],
@@ -8574,56 +8609,39 @@
 }
 
 cc_test {
-    name: "ltp_sendfile09",
-    stem: "sendfile09",
+    name: "ltp_lseek01",
+    stem: "lseek01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sendfile/sendfile09.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/sendfile",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
-    name: "ltp_cpuctl_latency_test",
-    stem: "cpuctl_latency_test",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/controllers/cpuctl/cpuctl_latency_test.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/controllers/libcontrollers",
-        "include/old",
-    ],
-    static_libs: [
-        "libltp_controllers",
-        "libltp_ltp",
-    ],
-}
-
-cc_test {
-    name: "ltp_pm_get_sched_values",
-    stem: "pm_get_sched_values",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/power_management/pm_get_sched_values.c"],
+    srcs: ["testcases/kernel/syscalls/lseek/lseek01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_waitpid11",
-    stem: "waitpid11",
+    name: "ltp_stream05",
+    stem: "stream05",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/waitpid/waitpid11.c"],
+    srcs: ["testcases/kernel/fs/stream/stream05.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
+    name: "ltp_ptem01",
+    stem: "ptem01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/pty/ptem01.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_GNU_SOURCE",
+    ],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_cap_bset_inh_bounds",
     stem: "cap_bset_inh_bounds",
     defaults: ["ltp_test_defaults"],
@@ -8661,10 +8679,10 @@
 }
 
 cc_test {
-    name: "ltp_getpeername01",
-    stem: "getpeername01",
+    name: "ltp_readv01",
+    stem: "readv01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getpeername/getpeername01.c"],
+    srcs: ["testcases/kernel/syscalls/readv/readv01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9078,12 +9096,16 @@
 }
 
 cc_test {
-    name: "ltp_alarm02",
-    stem: "alarm02",
+    name: "ltp_sendfile02",
+    stem: "sendfile02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/alarm/alarm02.c"],
+    srcs: ["testcases/kernel/syscalls/sendfile/sendfile02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/sendfile",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
     static_libs: ["libltp_ltp"],
 }
 
@@ -9255,10 +9277,10 @@
 }
 
 cc_test {
-    name: "ltp_writev02",
-    stem: "writev02",
+    name: "ltp_getppid01",
+    stem: "getppid01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/writev/writev02.c"],
+    srcs: ["testcases/kernel/syscalls/getppid/getppid01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9312,11 +9334,14 @@
 }
 
 cc_test {
-    name: "ltp_sysfs03",
-    stem: "sysfs03",
+    name: "ltp_aiodio_append",
+    stem: "aiodio_append",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sysfs/sysfs03.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
+    srcs: ["testcases/kernel/io/ltp-aiodio/aiodio_append.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-DAIO",
+    ],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
@@ -9332,10 +9357,10 @@
 }
 
 cc_test {
-    name: "ltp_sysfs02",
-    stem: "sysfs02",
+    name: "ltp_getppid02",
+    stem: "getppid02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sysfs/sysfs02.c"],
+    srcs: ["testcases/kernel/syscalls/getppid/getppid02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9432,10 +9457,10 @@
 }
 
 cc_test {
-    name: "ltp_ppoll01",
-    stem: "ppoll01",
+    name: "ltp_read01",
+    stem: "read01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/ppoll/ppoll01.c"],
+    srcs: ["testcases/kernel/syscalls/read/read01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9462,10 +9487,10 @@
 }
 
 cc_test {
-    name: "ltp_signal02",
-    stem: "signal02",
+    name: "ltp_read02",
+    stem: "read02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/signal/signal02.c"],
+    srcs: ["testcases/kernel/syscalls/read/read02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9535,16 +9560,6 @@
 }
 
 cc_test {
-    name: "ltp_sysfs06",
-    stem: "sysfs06",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sysfs/sysfs06.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_tomoyo_new_file_test",
     stem: "tomoyo_new_file_test",
     defaults: ["ltp_test_defaults"],
@@ -9597,16 +9612,6 @@
 }
 
 cc_test {
-    name: "ltp_dup205",
-    stem: "dup205",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/dup2/dup205.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_setdomainname03",
     stem: "setdomainname03",
     defaults: ["ltp_test_defaults"],
@@ -9727,19 +9732,20 @@
 }
 
 cc_test {
-    name: "ltp_gensinh",
-    stem: "gensinh",
+    name: "ltp_sysfs06",
+    stem: "sysfs06",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/misc/math/float/iperb/gensinh.c"],
+    srcs: ["testcases/kernel/syscalls/sysfs/sysfs06.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_getppid01",
-    stem: "getppid01",
+    name: "ltp_sysfs01",
+    stem: "sysfs01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getppid/getppid01.c"],
+    srcs: ["testcases/kernel/syscalls/sysfs/sysfs01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9756,20 +9762,20 @@
 }
 
 cc_test {
-    name: "ltp_access03",
-    stem: "access03",
+    name: "ltp_sysfs03",
+    stem: "sysfs03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/access/access03.c"],
+    srcs: ["testcases/kernel/syscalls/sysfs/sysfs03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_getppid02",
-    stem: "getppid02",
+    name: "ltp_sysfs02",
+    stem: "sysfs02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getppid/getppid02.c"],
+    srcs: ["testcases/kernel/syscalls/sysfs/sysfs02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9856,6 +9862,16 @@
 }
 
 cc_test {
+    name: "ltp_fchmod02",
+    stem: "fchmod02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/fchmod/fchmod02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_delete_module01",
     stem: "delete_module01",
     defaults: ["ltp_test_defaults"],
@@ -9886,10 +9902,10 @@
 }
 
 cc_test {
-    name: "ltp_link05",
-    stem: "link05",
+    name: "ltp_gethostname01",
+    stem: "gethostname01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/link/link05.c"],
+    srcs: ["testcases/kernel/syscalls/gethostname/gethostname01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9916,10 +9932,10 @@
 }
 
 cc_test {
-    name: "ltp_link06",
-    stem: "link06",
+    name: "ltp_fdatasync02",
+    stem: "fdatasync02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/link/link06.c"],
+    srcs: ["testcases/kernel/syscalls/fdatasync/fdatasync02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9936,16 +9952,6 @@
 }
 
 cc_test {
-    name: "ltp_setsockopt01",
-    stem: "setsockopt01",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/setsockopt/setsockopt01.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_link03",
     stem: "link03",
     defaults: ["ltp_test_defaults"],
@@ -9956,10 +9962,10 @@
 }
 
 cc_test {
-    name: "ltp_link02",
-    stem: "link02",
+    name: "ltp_sched_getattr02",
+    stem: "sched_getattr02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/link/link02.c"],
+    srcs: ["testcases/kernel/syscalls/sched_getattr/sched_getattr02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -9980,10 +9986,20 @@
 }
 
 cc_test {
-    name: "ltp_gethostname01",
-    stem: "gethostname01",
+    name: "ltp_link05",
+    stem: "link05",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/gethostname/gethostname01.c"],
+    srcs: ["testcases/kernel/syscalls/link/link05.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_dup06",
+    stem: "dup06",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/dup/dup06.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -10004,19 +10020,6 @@
 }
 
 cc_test {
-    name: "ltp_aiodio_append",
-    stem: "aiodio_append",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/io/ltp-aiodio/aiodio_append.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-DAIO",
-    ],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_aio01",
     stem: "aio01",
     defaults: ["ltp_test_defaults"],
@@ -10079,6 +10082,16 @@
 }
 
 cc_test {
+    name: "ltp_link06",
+    stem: "link06",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/link/link06.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_sched_getattr01",
     stem: "sched_getattr01",
     defaults: ["ltp_test_defaults"],
@@ -10244,12 +10257,15 @@
 }
 
 cc_test {
-    name: "ltp_chdir04",
-    stem: "chdir04",
+    name: "ltp_mem_process",
+    stem: "mem_process",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/chdir/chdir04.c"],
+    srcs: ["testcases/kernel/controllers/memcg/control/mem_process.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
+    local_include_dirs: [
+        "testcases/kernel/controllers/libcontrollers",
+        "include/old",
+    ],
     static_libs: ["libltp_ltp"],
 }
 
@@ -10274,6 +10290,16 @@
 }
 
 cc_test {
+    name: "ltp_perf_event_open02",
+    stem: "perf_event_open02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/perf_event_open/perf_event_open02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_create_long_dirs",
     stem: "create_long_dirs",
     defaults: ["ltp_test_defaults"],
@@ -10284,10 +10310,10 @@
 }
 
 cc_test {
-    name: "ltp_getpriority01",
-    stem: "getpriority01",
+    name: "ltp_iopl01",
+    stem: "iopl01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getpriority/getpriority01.c"],
+    srcs: ["testcases/kernel/syscalls/iopl/iopl01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -10332,10 +10358,10 @@
 }
 
 cc_test {
-    name: "ltp_madvise02",
-    stem: "madvise02",
+    name: "ltp_flock06",
+    stem: "flock06",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/madvise/madvise02.c"],
+    srcs: ["testcases/kernel/syscalls/flock/flock06.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -10402,10 +10428,10 @@
 }
 
 cc_test {
-    name: "ltp_getpriority02",
-    stem: "getpriority02",
+    name: "ltp_iopl02",
+    stem: "iopl02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/getpriority/getpriority02.c"],
+    srcs: ["testcases/kernel/syscalls/iopl/iopl02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -10561,6 +10587,19 @@
 }
 
 cc_test {
+    name: "ltp_clock_getres01",
+    stem: "clock_getres01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/clock_getres/clock_getres01.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_kill06",
     stem: "kill06",
     defaults: ["ltp_test_defaults"],
@@ -10607,24 +10646,6 @@
 }
 
 cc_test {
-    name: "ltp_min_free_kbytes",
-    stem: "min_free_kbytes",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/mem/tunable/min_free_kbytes.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/mem/include",
-        "testcases/kernel/include",
-        "include/old",
-    ],
-    static_libs: [
-        "libltp_mem",
-        "libltp_kerntest",
-        "libltp_ltp",
-    ],
-}
-
-cc_test {
     name: "ltp_pipe10",
     stem: "pipe10",
     defaults: ["ltp_test_defaults"],
@@ -10655,10 +10676,10 @@
 }
 
 cc_test {
-    name: "ltp_dup06",
-    stem: "dup06",
+    name: "ltp_mincore01",
+    stem: "mincore01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/dup/dup06.c"],
+    srcs: ["testcases/kernel/syscalls/mincore/mincore01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -10862,14 +10883,11 @@
 }
 
 cc_test {
-    name: "ltp_dirty",
-    stem: "dirty",
+    name: "ltp_signal05",
+    stem: "signal05",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/io/ltp-aiodio/dirty.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-DAIO",
-    ],
+    srcs: ["testcases/kernel/syscalls/signal/signal05.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
@@ -10985,16 +11003,21 @@
 }
 
 cc_test {
-    name: "ltp_inode02",
-    stem: "inode02",
+    name: "ltp_thp01",
+    stem: "thp01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/fs/inode/inode02.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-DLINUX",
+    srcs: ["testcases/kernel/mem/thp/thp01.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: [
+        "testcases/kernel/mem/include",
+        "testcases/kernel/include",
+        "include/old",
     ],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    static_libs: [
+        "libltp_mem",
+        "libltp_kerntest",
+        "libltp_ltp",
+    ],
 }
 
 cc_test {
@@ -11018,10 +11041,10 @@
 }
 
 cc_test {
-    name: "ltp_check_pe",
-    stem: "check_pe",
+    name: "ltp_mmapstress08",
+    stem: "mmapstress08",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/security/cap_bound/check_pe.c"],
+    srcs: ["testcases/kernel/mem/mmapstress/mmapstress08.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -11087,6 +11110,16 @@
 }
 
 cc_test {
+    name: "ltp_eventfd2_03",
+    stem: "eventfd2_03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/eventfd2/eventfd2_03.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_eventfd2_02",
     stem: "eventfd2_02",
     defaults: ["ltp_test_defaults"],
@@ -11131,10 +11164,10 @@
 }
 
 cc_test {
-    name: "ltp_tkill01",
-    stem: "tkill01",
+    name: "ltp_socketcall02",
+    stem: "socketcall02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/tkill/tkill01.c"],
+    srcs: ["testcases/kernel/syscalls/socketcall/socketcall02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -11259,11 +11292,14 @@
 }
 
 cc_test {
-    name: "ltp_perf_event_open02",
-    stem: "perf_event_open02",
+    name: "ltp_sigwaitinfo01",
+    stem: "sigwaitinfo01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/perf_event_open/perf_event_open02.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
+    srcs: ["testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-DTEST_SIGWAITINFO",
+    ],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
@@ -11288,10 +11324,10 @@
 }
 
 cc_test {
-    name: "ltp_tkill02",
-    stem: "tkill02",
+    name: "ltp_lgetxattr02",
+    stem: "lgetxattr02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/tkill/tkill02.c"],
+    srcs: ["testcases/kernel/syscalls/lgetxattr/lgetxattr02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -11358,6 +11394,16 @@
 }
 
 cc_test {
+    name: "ltp_readlink02",
+    stem: "readlink02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/readlink/readlink02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_sched_setparam03",
     stem: "sched_setparam03",
     defaults: ["ltp_test_defaults"],
@@ -11408,14 +11454,11 @@
 }
 
 cc_test {
-    name: "ltp_sigwait01",
-    stem: "sigwait01",
+    name: "ltp_chmod05",
+    stem: "chmod05",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-DTEST_SIGWAIT",
-    ],
+    srcs: ["testcases/kernel/syscalls/chmod/chmod05.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
@@ -11503,10 +11546,30 @@
 }
 
 cc_test {
-    name: "ltp_mmstress",
-    stem: "mmstress",
+    name: "ltp_mmapstress06",
+    stem: "mmapstress06",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/mem/mtest05/mmstress.c"],
+    srcs: ["testcases/kernel/mem/mmapstress/mmapstress06.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_check_pe",
+    stem: "check_pe",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/security/cap_bound/check_pe.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_getdents01",
+    stem: "getdents01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getdents/getdents01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -11537,10 +11600,10 @@
 }
 
 cc_test {
-    name: "ltp_mprotect03",
-    stem: "mprotect03",
+    name: "ltp_mmap16",
+    stem: "mmap16",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mprotect/mprotect03.c"],
+    srcs: ["testcases/kernel/syscalls/mmap/mmap16.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -11581,16 +11644,6 @@
 }
 
 cc_test {
-    name: "ltp_mprotect02",
-    stem: "mprotect02",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mprotect/mprotect02.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_setitimer01",
     stem: "setitimer01",
     defaults: ["ltp_test_defaults"],
@@ -11601,10 +11654,10 @@
 }
 
 cc_test {
-    name: "ltp_execle01",
-    stem: "execle01",
+    name: "ltp_setitimer03",
+    stem: "setitimer03",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/execle/execle01.c"],
+    srcs: ["testcases/kernel/syscalls/setitimer/setitimer03.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -11641,20 +11694,20 @@
 }
 
 cc_test {
-    name: "ltp_mprotect04",
-    stem: "mprotect04",
+    name: "ltp_mmap11",
+    stem: "mmap11",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/mprotect/mprotect04.c"],
+    srcs: ["testcases/kernel/syscalls/mmap/mmap11.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_statvfs01",
-    stem: "statvfs01",
+    name: "ltp_vfork01",
+    stem: "vfork01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/statvfs/statvfs01.c"],
+    srcs: ["testcases/kernel/syscalls/vfork/vfork01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -11725,6 +11778,16 @@
 }
 
 cc_test {
+    name: "ltp_io_getevents01",
+    stem: "io_getevents01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/io_getevents/io_getevents01.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_geny1",
     stem: "geny1",
     defaults: ["ltp_test_defaults"],
@@ -11743,20 +11806,20 @@
 }
 
 cc_test {
-    name: "ltp_stream05",
-    stem: "stream05",
+    name: "ltp_process_vm01",
+    stem: "process_vm01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/fs/stream/stream05.c"],
+    srcs: ["testcases/kernel/syscalls/cma/process_vm01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_statvfs02",
-    stem: "statvfs02",
+    name: "ltp_vfork02",
+    stem: "vfork02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/statvfs/statvfs02.c"],
+    srcs: ["testcases/kernel/syscalls/vfork/vfork02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -11793,29 +11856,16 @@
 }
 
 cc_test {
-    name: "ltp_create_short_dirs",
-    stem: "create_short_dirs",
+    name: "ltp_madvise02",
+    stem: "madvise02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/fs/ext4-new-features/ext4-subdir-limit/create_short_dirs.c"],
+    srcs: ["testcases/kernel/syscalls/madvise/madvise02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_mem_process",
-    stem: "mem_process",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/controllers/memcg/control/mem_process.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/controllers/libcontrollers",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_chdir01",
     stem: "chdir01",
     defaults: ["ltp_test_defaults"],
@@ -11866,10 +11916,20 @@
 }
 
 cc_test {
-    name: "ltp_quotactl02",
-    stem: "quotactl02",
+    name: "ltp_chdir04",
+    stem: "chdir04",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/quotactl/quotactl02.c"],
+    srcs: ["testcases/kernel/syscalls/chdir/chdir04.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_getpeername01",
+    stem: "getpeername01",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/getpeername/getpeername01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -12012,16 +12072,6 @@
 }
 
 cc_test {
-    name: "ltp_chmod05",
-    stem: "chmod05",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/chmod/chmod05.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_poll01",
     stem: "poll01",
     defaults: ["ltp_test_defaults"],
@@ -12072,20 +12122,20 @@
 }
 
 cc_test {
-    name: "ltp_vfork01",
-    stem: "vfork01",
+    name: "ltp_statvfs01",
+    stem: "statvfs01",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/vfork/vfork01.c"],
+    srcs: ["testcases/kernel/syscalls/statvfs/statvfs01.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
 cc_test {
-    name: "ltp_vfork02",
-    stem: "vfork02",
+    name: "ltp_statvfs02",
+    stem: "statvfs02",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/vfork/vfork02.c"],
+    srcs: ["testcases/kernel/syscalls/statvfs/statvfs02.c"],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
@@ -12255,19 +12305,20 @@
 }
 
 cc_test {
-    name: "ltp_fcntl03_64",
-    stem: "fcntl03_64",
+    name: "ltp_sendfile08_64",
+    stem: "sendfile08_64",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fcntl/fcntl03.c"],
+    srcs: ["testcases/kernel/syscalls/sendfile/sendfile08.c"],
     cflags: [
         "-D_FORTIFY_SOURCE=2",
         "-D_FILE_OFFSET_BITS=64",
         "-DTST_USE_NEWER64_SYSCALL=1",
         "-D_GNU_SOURCE",
+        "-DOFF_T=off64_t",
     ],
     local_include_dirs: [
         "testcases/kernel/syscalls/utils",
-        "testcases/kernel/syscalls/fcntl",
+        "testcases/kernel/syscalls/sendfile",
         "include/old",
     ],
     static_libs: ["libltp_ltp"],
@@ -12287,20 +12338,18 @@
 }
 
 cc_test {
-    name: "ltp_sendfile08_64",
-    stem: "sendfile08_64",
+    name: "ltp_pread02_64",
+    stem: "pread02_64",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sendfile/sendfile08.c"],
+    srcs: ["testcases/kernel/syscalls/pread/pread02.c"],
     cflags: [
         "-D_FORTIFY_SOURCE=2",
         "-D_FILE_OFFSET_BITS=64",
         "-DTST_USE_NEWER64_SYSCALL=1",
-        "-D_GNU_SOURCE",
-        "-DOFF_T=off64_t",
     ],
     local_include_dirs: [
         "testcases/kernel/syscalls/utils",
-        "testcases/kernel/syscalls/sendfile",
+        "testcases/kernel/syscalls/pread",
         "include/old",
     ],
     static_libs: ["libltp_ltp"],
@@ -12511,6 +12560,20 @@
 }
 
 cc_test {
+    name: "ltp_setfsuid02",
+    stem: "setfsuid02",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsuid/setfsuid02.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setfsuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_setuid04",
     stem: "setuid04",
     defaults: ["ltp_test_defaults"],
@@ -12625,19 +12688,20 @@
 }
 
 cc_test {
-    name: "ltp_fcntl13_64",
-    stem: "fcntl13_64",
+    name: "ltp_sendfile04_64",
+    stem: "sendfile04_64",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/fcntl/fcntl13.c"],
+    srcs: ["testcases/kernel/syscalls/sendfile/sendfile04.c"],
     cflags: [
         "-D_FORTIFY_SOURCE=2",
         "-D_FILE_OFFSET_BITS=64",
         "-DTST_USE_NEWER64_SYSCALL=1",
         "-D_GNU_SOURCE",
+        "-DOFF_T=off64_t",
     ],
     local_include_dirs: [
         "testcases/kernel/syscalls/utils",
-        "testcases/kernel/syscalls/fcntl",
+        "testcases/kernel/syscalls/sendfile",
         "include/old",
     ],
     static_libs: ["libltp_ltp"],
@@ -12809,37 +12873,6 @@
 }
 
 cc_test {
-    name: "ltp_lstat01_64",
-    stem: "lstat01_64",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/lstat/lstat01.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_FILE_OFFSET_BITS=64",
-        "-DTST_USE_NEWER64_SYSCALL=1",
-    ],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/lstat",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
-    name: "ltp_tst_get_unused_port",
-    stem: "tst_get_unused_port",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["tools/apicmds/ltpapicmd.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_GNU_SOURCE",
-    ],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_sendfile05_64",
     stem: "sendfile05_64",
     defaults: ["ltp_test_defaults"],
@@ -12860,6 +12893,19 @@
 }
 
 cc_test {
+    name: "ltp_tst_get_unused_port",
+    stem: "tst_get_unused_port",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["tools/apicmds/ltpapicmd.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_GNU_SOURCE",
+    ],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_ns-udpclient",
     stem: "ns-udpclient",
     defaults: ["ltp_test_defaults"],
@@ -12963,17 +13009,23 @@
 }
 
 cc_test {
-    name: "ltp_setfsuid02",
-    stem: "setfsuid02",
+    name: "ltp_move_pages05",
+    stem: "move_pages05",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/setfsuid/setfsuid02.c"],
+    srcs: [
+        "testcases/kernel/syscalls/move_pages/move_pages_support.c",
+        "testcases/kernel/syscalls/move_pages/move_pages05.c",
+    ],
     cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: [
-        "testcases/kernel/syscalls/setfsuid",
+        "testcases/kernel/include",
         "testcases/kernel/syscalls/utils",
         "include/old",
     ],
-    static_libs: ["libltp_ltp"],
+    static_libs: [
+        "libltp_kerntest",
+        "libltp_ltp",
+    ],
 }
 
 cc_test {
@@ -12991,20 +13043,6 @@
 }
 
 cc_test {
-    name: "ltp_setreuid06",
-    stem: "setreuid06",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/setreuid/setreuid06.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/setreuid",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_setreuid05",
     stem: "setreuid05",
     defaults: ["ltp_test_defaults"],
@@ -13166,24 +13204,6 @@
 }
 
 cc_test {
-    name: "ltp_pselect02_64",
-    stem: "pselect02_64",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/pselect/pselect02.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_FILE_OFFSET_BITS=64",
-        "-DTST_USE_NEWER64_SYSCALL=1",
-    ],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/pselect",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_ftruncate03_64",
     stem: "ftruncate03_64",
     defaults: ["ltp_test_defaults"],
@@ -13214,19 +13234,19 @@
 }
 
 cc_test {
-    name: "ltp_statfs02_64",
-    stem: "statfs02_64",
+    name: "ltp_lstat01_64",
+    stem: "lstat01_64",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/statfs/statfs02.c"],
+    srcs: ["testcases/kernel/syscalls/lstat/lstat01.c"],
     cflags: [
         "-D_FORTIFY_SOURCE=2",
         "-D_FILE_OFFSET_BITS=64",
         "-DTST_USE_NEWER64_SYSCALL=1",
     ],
     local_include_dirs: [
+        "testcases/kernel/syscalls/lstat",
         "testcases/kernel/syscalls/utils",
         "include/old",
-        "testcases/kernel/syscalls/statfs",
     ],
     static_libs: ["libltp_ltp"],
 }
@@ -13251,6 +13271,43 @@
 }
 
 cc_test {
+    name: "ltp_pselect03_64",
+    stem: "pselect03_64",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/pselect/pselect03.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_FILE_OFFSET_BITS=64",
+        "-DTST_USE_NEWER64_SYSCALL=1",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/pselect",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_fcntl03_64",
+    stem: "fcntl03_64",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/fcntl/fcntl03.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_FILE_OFFSET_BITS=64",
+        "-DTST_USE_NEWER64_SYSCALL=1",
+        "-D_GNU_SOURCE",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/fcntl",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_nfs_flock_dgen",
     stem: "nfs_flock_dgen",
     defaults: ["ltp_test_defaults"],
@@ -13406,24 +13463,6 @@
 }
 
 cc_test {
-    name: "ltp_pselect03_64",
-    stem: "pselect03_64",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/pselect/pselect03.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_FILE_OFFSET_BITS=64",
-        "-DTST_USE_NEWER64_SYSCALL=1",
-    ],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/pselect",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_setregid04",
     stem: "setregid04",
     defaults: ["ltp_test_defaults"],
@@ -13480,6 +13519,20 @@
 }
 
 cc_test {
+    name: "ltp_setreuid06",
+    stem: "setreuid06",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setreuid/setreuid06.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setreuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_disktest",
     stem: "disktest",
     defaults: ["ltp_test_defaults"],
@@ -13555,23 +13608,21 @@
 }
 
 cc_test {
-    name: "ltp_move_pages05",
-    stem: "move_pages05",
+    name: "ltp_statfs02_64",
+    stem: "statfs02_64",
     defaults: ["ltp_test_defaults"],
-    srcs: [
-        "testcases/kernel/syscalls/move_pages/move_pages_support.c",
-        "testcases/kernel/syscalls/move_pages/move_pages05.c",
+    srcs: ["testcases/kernel/syscalls/statfs/statfs02.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_FILE_OFFSET_BITS=64",
+        "-DTST_USE_NEWER64_SYSCALL=1",
     ],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: [
-        "testcases/kernel/include",
         "testcases/kernel/syscalls/utils",
         "include/old",
+        "testcases/kernel/syscalls/statfs",
     ],
-    static_libs: [
-        "libltp_kerntest",
-        "libltp_ltp",
-    ],
+    static_libs: ["libltp_ltp"],
 }
 
 cc_test {
@@ -13717,16 +13768,23 @@
 }
 
 cc_test {
-    name: "ltp_ht_interrupt",
-    stem: "ht_interrupt",
+    name: "ltp_move_pages11",
+    stem: "move_pages11",
     defaults: ["ltp_test_defaults"],
     srcs: [
-        "testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.c",
-        "testcases/kernel/sched/hyperthreading/ht_interrupt/ht_interrupt.c",
+        "testcases/kernel/syscalls/move_pages/move_pages_support.c",
+        "testcases/kernel/syscalls/move_pages/move_pages11.c",
     ],
     cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
+    local_include_dirs: [
+        "testcases/kernel/include",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: [
+        "libltp_kerntest",
+        "libltp_ltp",
+    ],
 }
 
 cc_test {
@@ -13897,16 +13955,15 @@
 }
 
 cc_test {
-    name: "ltp_setfsuid03",
-    stem: "setfsuid03",
+    name: "ltp_ht_interrupt",
+    stem: "ht_interrupt",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/setfsuid/setfsuid03.c"],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/setfsuid",
-        "testcases/kernel/syscalls/utils",
-        "include/old",
+    srcs: [
+        "testcases/kernel/sched/hyperthreading/ht_interrupt/ht_utils.c",
+        "testcases/kernel/sched/hyperthreading/ht_interrupt/ht_interrupt.c",
     ],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
     static_libs: ["libltp_ltp"],
 }
 
@@ -14502,20 +14559,19 @@
 }
 
 cc_test {
-    name: "ltp_sendfile07_64",
-    stem: "sendfile07_64",
+    name: "ltp_pwrite01_64",
+    stem: "pwrite01_64",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sendfile/sendfile07.c"],
+    srcs: ["testcases/kernel/syscalls/pwrite/pwrite01.c"],
     cflags: [
         "-D_FORTIFY_SOURCE=2",
         "-D_FILE_OFFSET_BITS=64",
         "-DTST_USE_NEWER64_SYSCALL=1",
-        "-D_GNU_SOURCE",
-        "-DOFF_T=off64_t",
+        "-Wno-error",
     ],
     local_include_dirs: [
+        "testcases/kernel/syscalls/pwrite",
         "testcases/kernel/syscalls/utils",
-        "testcases/kernel/syscalls/sendfile",
         "include/old",
     ],
     static_libs: ["libltp_ltp"],
@@ -14618,20 +14674,19 @@
 }
 
 cc_test {
-    name: "ltp_sendfile04_64",
-    stem: "sendfile04_64",
+    name: "ltp_fcntl13_64",
+    stem: "fcntl13_64",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sendfile/sendfile04.c"],
+    srcs: ["testcases/kernel/syscalls/fcntl/fcntl13.c"],
     cflags: [
         "-D_FORTIFY_SOURCE=2",
         "-D_FILE_OFFSET_BITS=64",
         "-DTST_USE_NEWER64_SYSCALL=1",
         "-D_GNU_SOURCE",
-        "-DOFF_T=off64_t",
     ],
     local_include_dirs: [
         "testcases/kernel/syscalls/utils",
-        "testcases/kernel/syscalls/sendfile",
+        "testcases/kernel/syscalls/fcntl",
         "include/old",
     ],
     static_libs: ["libltp_ltp"],
@@ -15014,6 +15069,19 @@
 }
 
 cc_test {
+    name: "ltp_sched_tc2",
+    stem: "sched_tc2",
+    defaults: ["ltp_test_defaults"],
+    srcs: [
+        "testcases/kernel/sched/sched_stress/sched.c",
+        "testcases/kernel/sched/sched_stress/sched_tc2.c",
+    ],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: ["include/old"],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_move_pages10",
     stem: "move_pages10",
     defaults: ["ltp_test_defaults"],
@@ -15034,23 +15102,41 @@
 }
 
 cc_test {
-    name: "ltp_move_pages11",
-    stem: "move_pages11",
+    name: "ltp_sendfile02_64",
+    stem: "sendfile02_64",
     defaults: ["ltp_test_defaults"],
-    srcs: [
-        "testcases/kernel/syscalls/move_pages/move_pages_support.c",
-        "testcases/kernel/syscalls/move_pages/move_pages11.c",
+    srcs: ["testcases/kernel/syscalls/sendfile/sendfile02.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_FILE_OFFSET_BITS=64",
+        "-DTST_USE_NEWER64_SYSCALL=1",
+        "-D_GNU_SOURCE",
+        "-DOFF_T=off64_t",
     ],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
     local_include_dirs: [
-        "testcases/kernel/include",
+        "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/sendfile",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
+    name: "ltp_pselect02_64",
+    stem: "pselect02_64",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/pselect/pselect02.c"],
+    cflags: [
+        "-D_FORTIFY_SOURCE=2",
+        "-D_FILE_OFFSET_BITS=64",
+        "-DTST_USE_NEWER64_SYSCALL=1",
+    ],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/pselect",
         "testcases/kernel/syscalls/utils",
         "include/old",
     ],
-    static_libs: [
-        "libltp_kerntest",
-        "libltp_ltp",
-    ],
+    static_libs: ["libltp_ltp"],
 }
 
 cc_test {
@@ -15150,6 +15236,20 @@
 }
 
 cc_test {
+    name: "ltp_setfsuid03",
+    stem: "setfsuid03",
+    defaults: ["ltp_test_defaults"],
+    srcs: ["testcases/kernel/syscalls/setfsuid/setfsuid03.c"],
+    cflags: ["-D_FORTIFY_SOURCE=2"],
+    local_include_dirs: [
+        "testcases/kernel/syscalls/setfsuid",
+        "testcases/kernel/syscalls/utils",
+        "include/old",
+    ],
+    static_libs: ["libltp_ltp"],
+}
+
+cc_test {
     name: "ltp_posix_fadvise03_64",
     stem: "posix_fadvise03_64",
     defaults: ["ltp_test_defaults"],
@@ -15236,19 +15336,20 @@
 }
 
 cc_test {
-    name: "ltp_pwrite01_64",
-    stem: "pwrite01_64",
+    name: "ltp_sendfile07_64",
+    stem: "sendfile07_64",
     defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/pwrite/pwrite01.c"],
+    srcs: ["testcases/kernel/syscalls/sendfile/sendfile07.c"],
     cflags: [
         "-D_FORTIFY_SOURCE=2",
         "-D_FILE_OFFSET_BITS=64",
         "-DTST_USE_NEWER64_SYSCALL=1",
-        "-Wno-error",
+        "-D_GNU_SOURCE",
+        "-DOFF_T=off64_t",
     ],
     local_include_dirs: [
-        "testcases/kernel/syscalls/pwrite",
         "testcases/kernel/syscalls/utils",
+        "testcases/kernel/syscalls/sendfile",
         "include/old",
     ],
     static_libs: ["libltp_ltp"],
@@ -15503,26 +15604,6 @@
 }
 
 cc_test {
-    name: "ltp_sendfile02_64",
-    stem: "sendfile02_64",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/sendfile/sendfile02.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_FILE_OFFSET_BITS=64",
-        "-DTST_USE_NEWER64_SYSCALL=1",
-        "-D_GNU_SOURCE",
-        "-DOFF_T=off64_t",
-    ],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/utils",
-        "testcases/kernel/syscalls/sendfile",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_preadv02_64",
     stem: "preadv02_64",
     defaults: ["ltp_test_defaults"],
@@ -15640,19 +15721,6 @@
 }
 
 cc_test {
-    name: "ltp_sched_tc2",
-    stem: "sched_tc2",
-    defaults: ["ltp_test_defaults"],
-    srcs: [
-        "testcases/kernel/sched/sched_stress/sched.c",
-        "testcases/kernel/sched/sched_stress/sched_tc2.c",
-    ],
-    cflags: ["-D_FORTIFY_SOURCE=2"],
-    local_include_dirs: ["include/old"],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_fcntl10_64",
     stem: "fcntl10_64",
     defaults: ["ltp_test_defaults"],
@@ -15703,24 +15771,6 @@
 }
 
 cc_test {
-    name: "ltp_pread02_64",
-    stem: "pread02_64",
-    defaults: ["ltp_test_defaults"],
-    srcs: ["testcases/kernel/syscalls/pread/pread02.c"],
-    cflags: [
-        "-D_FORTIFY_SOURCE=2",
-        "-D_FILE_OFFSET_BITS=64",
-        "-DTST_USE_NEWER64_SYSCALL=1",
-    ],
-    local_include_dirs: [
-        "testcases/kernel/syscalls/utils",
-        "testcases/kernel/syscalls/pread",
-        "include/old",
-    ],
-    static_libs: ["libltp_ltp"],
-}
-
-cc_test {
     name: "ltp_fcntl21_64",
     stem: "fcntl21_64",
     defaults: ["ltp_test_defaults"],