Bring lists back to the sorted order

* .gitignore: Make the list sorted again.
* Makefile.am (strace_SOURCES): Likewise.
* tests/.gitignore: Likewise.
* tests/gen_tests.in: Likewise.
* tests/Makefile.am (check_PROGRAMS, DECODER_TESTS, EXTRA_DIST):
Likewise.

diff --git a/.gitignore b/.gitignore
index df8583bbbd742e40f2f74319a9418d0998ca8a04..6a56042d8e35ce7bc07a3cbaefc3032660ce836e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,8 @@
 /.version
 /CREDITS
 /ChangeLog
+/INSTALL
+/README
 /aclocal.m4
 /autom4te.cache
 /bpf_attr_check.c
@@ -25,7 +27,6 @@
 /configure
 /depcomp
 /gnu
-/INSTALL
 /install-sh
 /ioctl_iocdef.[ih]
 /ioctl_redefs[12].h
@@ -54,15 +55,14 @@
 /native_printer_decls.h
 /native_printer_defs.h
 /printers.h
-/README
 /scno.h
 /sen.h
 /stamp-h1
 /strace
 /strace-*.tar.gz
 /strace-*.tar.xz
-/strace.1
 /strace-log-merge.1
+/strace.1
 /strace.dsc
 /strace.spec
 /sys_func.h

diff --git a/Makefile.am b/Makefile.am
index 71d25581ec027c2b00221ca1e5fab3395293e040..20cbd28588b444a4a61c6f87862aa2ff08734a9b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -127,8 +127,8 @@ strace_SOURCES =    \
        fetch_struct_xfs_quotastat.c \
        file_handle.c   \
        file_ioctl.c    \
-       filter_qualify.c \
        filter.h        \
+       filter_qualify.c \
        flock.c         \
        flock.h         \
        fs_x_ioctl.c    \
@@ -193,10 +193,9 @@ strace_SOURCES =   \
        netlink.c       \
        netlink.h       \
        netlink_crypto.c \
+       netlink_inet_diag.c \
        netlink_kobject_uevent.c \
        netlink_kobject_uevent.h \
-       netlink_sock_diag.h \
-       netlink_inet_diag.c \
        netlink_netfilter.c \
        netlink_netlink_diag.c \
        netlink_packet_diag.c \
@@ -205,6 +204,7 @@ strace_SOURCES =    \
        netlink_selinux.c \
        netlink_smc_diag.c \
        netlink_sock_diag.c \
+       netlink_sock_diag.h \
        netlink_unix_diag.c \
        nlattr.c        \
        nlattr.h        \
@@ -227,8 +227,8 @@ strace_SOURCES =    \
        prctl.c         \
        print_aio_sigset.c \
        print_dev_t.c   \
-       print_group_req.c \
        print_fields.h  \
+       print_group_req.c \
        print_ifindex.c \
        print_instruction_pointer.c \
        print_kernel_version.c \
@@ -307,8 +307,8 @@ strace_SOURCES =    \
        statx.c         \
        statx.h         \
        strace.c        \
-       string_to_uint.h \
        string_to_uint.c \
+       string_to_uint.h \
        swapon.c        \
        syscall.c       \
        sysctl.c        \

diff --git a/tests/.gitignore b/tests/.gitignore
index ca2d142483669d8f126bdb3e52c692511b673d78..9ec7a53121cdcd4de5b2ffd1cd17b024c88ee0ce 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -148,9 +148,9 @@ ioctl_block
 ioctl_dm
 ioctl_dm-v
 ioctl_evdev
-ioctl_evdev-v
 ioctl_evdev-success
 ioctl_evdev-success-v
+ioctl_evdev-v
 ioctl_inotify
 ioctl_kvm_run
 ioctl_kvm_run-v

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 825c989bb7855ab028513f55dee6901117c80aa4..c47289091e14f491b30135313073d896e112c0ff 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -97,9 +97,9 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
        inject-nf \
        int_0x80 \
        ioctl_dm-v \
-       ioctl_evdev-v \
        ioctl_evdev-success \
        ioctl_evdev-success-v \
+       ioctl_evdev-v \
        ioctl_loop-nv \
        ioctl_loop-v \
        ioctl_nsfs \
@@ -230,8 +230,8 @@ DECODER_TESTS = \
        getuid.test \
        int_0x80.test \
        ioctl.test \
-       ioctl_evdev-success.test \
        ioctl_evdev-success-v.test \
+       ioctl_evdev-success.test \
        ioctl_perf-success.test \
        ipc_msgbuf.test \
        kern_features-fault.test \
@@ -381,8 +381,8 @@ EXTRA_DIST = \
        getresugid.c \
        init.sh \
        init_delete_module.h \
-       ipc.sh \
        ioctl_kvm_run_common.c \
+       ipc.sh \
        ksysent.sed \
        lstatx.c \
        match.awk \
@@ -429,10 +429,10 @@ EXTRA_DIST = \
        trace_lstat.in \
        trace_personality_32.in \
        trace_personality_64.in \
-       trace_personality_x32.in \
        trace_personality_regex_32.in \
        trace_personality_regex_64.in \
        trace_personality_regex_x32.in \
+       trace_personality_x32.in \
        trace_question.in \
        trace_stat.in \
        trace_stat_like.in \

diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index c79c0884c24c0e25ab62664fc44ea074d6792b73..72758df574e558a15c0a7dac2cc79a9ad6aad164 100644 (file)
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -17,11 +17,11 @@ aio -a14 -e trace=io_setup,io_submit,io_getevents,io_cancel,io_destroy
 aio_pgetevents -e trace=io_pgetevents
 alarm  -a10
 bpf    -a20
-bpf-v  -a20 -v -e trace=bpf
 bpf-obj_get_info_by_fd -a20 -y -e trace=bpf
-bpf-obj_get_info_by_fd-v       -a20 -y -v -e trace=bpf
 bpf-obj_get_info_by_fd-prog    -a20 -y -e trace=bpf
 bpf-obj_get_info_by_fd-prog-v  -a20 -y -v -e trace=bpf
+bpf-obj_get_info_by_fd-v       -a20 -y -v -e trace=bpf
+bpf-v  -a20 -v -e trace=bpf
 btrfs  +ioctl.test
 chmod  -a28
 chown  -a28
@@ -166,11 +166,11 @@ ipc_shm-Xraw      +ipc.sh -Xraw -a19
 ipc_shm-Xverbose       +ipc.sh -Xverbose -a36
 kcmp   -a22
 kcmp-y -a22 -y -e trace=kcmp
+kern_features -a16
 kernel_version -a16 -v -e trace=bpf
 kernel_version-Xabbrev -a16 -Xabbrev -v -e trace=bpf
 kernel_version-Xraw    -a16 -Xraw -v -e trace=bpf
 kernel_version-Xverbose        -a16 -Xverbose -v -e trace=bpf
-kern_features -a16
 kexec_file_load        -s9
 kexec_load     -s9
 keyctl -a31 -s10
@@ -243,7 +243,6 @@ netlink_route       +netlink_sock_diag.test
 netlink_selinux        +netlink_sock_diag.test
 netlink_xfrm   +netlink_sock_diag.test
 newfstatat     -a32 -v -P stat.sample -P /dev/full
-nlattr         +netlink_sock_diag.test
 nfnetlink_acct                 +netlink_sock_diag.test
 nfnetlink_cthelper             +netlink_sock_diag.test
 nfnetlink_ctnetlink            +netlink_sock_diag.test
@@ -255,8 +254,9 @@ nfnetlink_nftables          +netlink_sock_diag.test
 nfnetlink_osf                  +netlink_sock_diag.test
 nfnetlink_queue                        +netlink_sock_diag.test
 nfnetlink_ulog                 +netlink_sock_diag.test
-nlattr_crypto_user_alg         +netlink_sock_diag.test
+nlattr         +netlink_sock_diag.test
 nlattr_br_port_msg             +netlink_sock_diag.test
+nlattr_crypto_user_alg         +netlink_sock_diag.test
 nlattr_dcbmsg                  +netlink_sock_diag.test
 nlattr_fib_rule_hdr            +netlink_sock_diag.test
 nlattr_ifaddrlblmsg            +netlink_sock_diag.test
@@ -288,10 +288,10 @@ nlattr_tcmsg                      +netlink_sock_diag.test
 nlattr_unix_diag_msg           +netlink_sock_diag.test
 old_mmap       -a11 -e trace=mmap
 old_mmap-P     -e trace=mmap -P "/dev/full" 9>>/dev/full
-old_mmap-v-none        -a11 -e trace=mmap -e verbose=none
 old_mmap-Xabbrev       -a11 -e trace=mmap -Xabbrev
 old_mmap-Xraw  -a11 -e trace=mmap -Xraw
 old_mmap-Xverbose      -a11 -e trace=mmap -Xverbose
+old_mmap-v-none        -a11 -e trace=mmap -e verbose=none
 oldfstat       -a18 -v -P stat.sample
 oldlstat       -a32 -v -P stat.sample -P /dev/full
 oldselect      -a13 -e trace=select
@@ -320,13 +320,13 @@ pread64-pwrite64  -a21 -eread=0 -ewrite=1 -e trace=pread64,pwrite64 -P pread64-pw
 preadv -a21
 preadv-pwritev -a19 -eread=0 -ewrite=1 -e trace=preadv,pwritev
 preadv2-pwritev2       -a22 -eread=0 -ewrite=1 -e trace=preadv2,pwritev2
-printstr       -e trace=writev
 printpath-umovestr     -a11 -e signal=none -e trace=chdir
 printpath-umovestr-peekdata    -a11 -e signal=none -e trace=chdir
 printpath-umovestr-undumpable  -a11 -e signal=none -e trace=chdir
 printsignal-Xabbrev    -a11 -Xabbrev -e signal=none -e trace=kill
 printsignal-Xraw       -a11 -Xraw -e signal=none -e trace=kill
 printsignal-Xverbose   -a11 -Xverbose -e signal=none -e trace=kill
+printstr       -e trace=writev
 printstrn-umoven       -s4096 -e signal=none -e trace=add_key
 printstrn-umoven-peekdata      -e signal=none -e trace=add_key
 printstrn-umoven-undumpable    -e signal=none -e trace=add_key
@@ -466,10 +466,10 @@ trace_fstatfs     test_trace_expr '' -e%fstatfs
 trace_lstat    test_trace_expr '' -e%lstat -v -P stat.sample -P /dev/full
 trace_personality_32   +qualify_personality.sh 32 'getcwd' 'fsync-y'
 trace_personality_64   +qualify_personality.sh 64 'getcwd' 'fsync-y'
-trace_personality_x32  +qualify_personality.sh x32 'getcwd' 'fsync-y'
 trace_personality_regex_32     +qualify_personality.sh 32 '/clock.*' 'times|fcntl.*'
 trace_personality_regex_64     +qualify_personality.sh 64 '/clock.*' 'times|fcntl.*'
 trace_personality_regex_x32    +qualify_personality.sh x32 '/clock.*' 'times|fcntl.*'
+trace_personality_x32  +qualify_personality.sh x32 'getcwd' 'fsync-y'
 trace_question test_trace_expr '' -e?osf_utimes,?/^pkey_.*
 trace_stat     test_trace_expr '' -e%stat -v -P stat.sample -P /dev/full
 trace_stat_like        test_trace_expr '' -e%%stat -v -P stat.sample -P /dev/full