summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry V. Levin <ldv@strace.io>2021-03-30 08:00:00 +0000
committerDmitry V. Levin <ldv@strace.io>2021-03-30 08:00:00 +0000
commit4eff801802e5f7794d32e43003e4cd5a0cf8ba56 (patch)
treec36dc40e95be2d2b44d7b73f57ee1ba7333dae8e
parent8fb8f769769982292a49c4cb755d779656ff89da (diff)
downloadstrace-4eff801802e5f7794d32e43003e4cd5a0cf8ba56.tar.gz
Bring lists back to the sorted order
* src/Makefile.am (libstrace_a_SOURCES): Make the list sorted again. * tests/Makefile.am (check_PROGRAMS): Likewise. * tests/.gitignore: Likewise. * tests/gen_tests.in: Likewise.
-rw-r--r--src/Makefile.am2
-rw-r--r--tests/.gitignore40
-rw-r--r--tests/Makefile.am22
-rw-r--r--tests/gen_tests.in68
4 files changed, 66 insertions, 66 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ee9415ea5..b5abd1c86 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -237,12 +237,12 @@ libstrace_a_SOURCES = \
poke.h \
poll.c \
prctl.c \
- print_kernel_sigset.c \
print_dev_t.c \
print_fields.h \
print_group_req.c \
print_ifindex.c \
print_instruction_pointer.c \
+ print_kernel_sigset.c \
print_kernel_version.c \
print_mac.c \
print_mq_attr.c \
diff --git a/tests/.gitignore b/tests/.gitignore
index a2f3419b0..2359ce276 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -132,12 +132,13 @@ fcntl64--pidns-translation
fdatasync
fflush
file_handle
-filter_seccomp-perf
filter-unavailable
+filter_seccomp-flag
+filter_seccomp-perf
finit_module
flock
-fork-f
fork--pidns-translation
+fork-f
fsconfig
fsconfig-P
fsmount
@@ -162,8 +163,8 @@ ftruncate64
futex
futimesat
gen_tests.am
-get_process_reaper
get_mempolicy
+get_process_reaper
getcpu
getcwd
getdents
@@ -220,6 +221,9 @@ ioctl_block--pidns-translation
ioctl_dm
ioctl_dm-v
ioctl_evdev
+ioctl_evdev-Xabbrev
+ioctl_evdev-Xraw
+ioctl_evdev-Xverbose
ioctl_evdev-success
ioctl_evdev-success-Xabbrev
ioctl_evdev-success-Xraw
@@ -228,9 +232,6 @@ ioctl_evdev-success-v
ioctl_evdev-success-v-Xabbrev
ioctl_evdev-success-v-Xraw
ioctl_evdev-success-v-Xverbose
-ioctl_evdev-Xabbrev
-ioctl_evdev-Xraw
-ioctl_evdev-Xverbose
ioctl_evdev-v
ioctl_evdev-v-Xabbrev
ioctl_evdev-v-Xraw
@@ -260,6 +261,9 @@ ioctl_fs_x-success-Xabbrev
ioctl_fs_x-success-Xraw
ioctl_fs_x-success-Xverbose
ioctl_gpio
+ioctl_gpio-Xabbrev
+ioctl_gpio-Xraw
+ioctl_gpio-Xverbose
ioctl_gpio-success
ioctl_gpio-success-Xabbrev
ioctl_gpio-success-Xraw
@@ -268,14 +272,14 @@ ioctl_gpio-success-v
ioctl_gpio-success-v-Xabbrev
ioctl_gpio-success-v-Xraw
ioctl_gpio-success-v-Xverbose
-ioctl_gpio-Xabbrev
-ioctl_gpio-Xraw
-ioctl_gpio-Xverbose
ioctl_gpio-v
ioctl_gpio-v-Xabbrev
ioctl_gpio-v-Xraw
ioctl_gpio-v-Xverbose
ioctl_hdio
+ioctl_hdio-Xabbrev
+ioctl_hdio-Xraw
+ioctl_hdio-Xverbose
ioctl_hdio-success
ioctl_hdio-success-Xabbrev
ioctl_hdio-success-Xraw
@@ -284,9 +288,6 @@ ioctl_hdio-success-v
ioctl_hdio-success-v-Xabbrev
ioctl_hdio-success-v-Xraw
ioctl_hdio-success-v-Xverbose
-ioctl_hdio-Xabbrev
-ioctl_hdio-Xraw
-ioctl_hdio-Xverbose
ioctl_hdio-v
ioctl_hdio-v-Xabbrev
ioctl_hdio-v-Xraw
@@ -322,10 +323,6 @@ ioctl_v4l2
ioctl_v4l2-Xabbrev
ioctl_v4l2-Xraw
ioctl_v4l2-Xverbose
-ioctl_v4l2-v
-ioctl_v4l2-v-Xabbrev
-ioctl_v4l2-v-Xraw
-ioctl_v4l2-v-Xverbose
ioctl_v4l2-success
ioctl_v4l2-success-Xabbrev
ioctl_v4l2-success-Xraw
@@ -334,6 +331,10 @@ ioctl_v4l2-success-v
ioctl_v4l2-success-v-Xabbrev
ioctl_v4l2-success-v-Xraw
ioctl_v4l2-success-v-Xverbose
+ioctl_v4l2-v
+ioctl_v4l2-v-Xabbrev
+ioctl_v4l2-v-Xraw
+ioctl_v4l2-v-Xverbose
ioctl_watchdog
ioperm
iopl
@@ -435,10 +436,10 @@ mount-Xverbose
move_mount
move_mount-P
move_pages
+move_pages--pidns-translation
move_pages-Xabbrev
move_pages-Xraw
move_pages-Xverbose
-move_pages--pidns-translation
mq
mq_sendrecv
mq_sendrecv-read
@@ -574,10 +575,10 @@ pidfd_open
pidfd_open--decode-fd-path
pidfd_open--decode-fd-pidfd
pidfd_open--decode-fd-socket
+pidfd_open--pidns-translation
pidfd_open-P
pidfd_open-y
pidfd_open-yy
-pidfd_open--pidns-translation
pidfd_send_signal
pidfd_send_signal--pidns-translation
pidns-cache
@@ -706,7 +707,6 @@ sched_yield
scm_rights
scno.h
seccomp-filter
-filter_seccomp-flag
seccomp-filter-v
seccomp-strict
seccomp_get_action_avail
@@ -769,10 +769,10 @@ sleep
so_error
so_linger
so_peercred
+so_peercred--pidns-translation
so_peercred-Xabbrev
so_peercred-Xraw
so_peercred-Xverbose
-so_peercred--pidns-translation
sock_filter-v
sock_filter-v-Xabbrev
sock_filter-v-Xraw
diff --git a/tests/Makefile.am b/tests/Makefile.am
index b8efce824..7c4f5e06b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -96,6 +96,10 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
caps-abbrev \
check_sigblock \
check_sigign \
+ clone3-success \
+ clone3-success-Xabbrev \
+ clone3-success-Xraw \
+ clone3-success-Xverbose \
clone_parent \
clone_parent--quiet-exit \
clone_parent-q \
@@ -105,10 +109,6 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
clone_ptrace--quiet-exit \
clone_ptrace-q \
clone_ptrace-qq \
- clone3-success \
- clone3-success-Xabbrev \
- clone3-success-Xraw \
- clone3-success-Xverbose \
close_range \
close_range-P \
close_range-y \
@@ -119,11 +119,11 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
execveat-v \
fcntl--pidns-translation \
fcntl64--pidns-translation \
+ filter-unavailable \
filter_seccomp-flag \
filter_seccomp-perf \
- filter-unavailable \
- fork-f \
fork--pidns-translation \
+ fork-f \
fsync-y \
get_process_reaper \
getpgrp--pidns-translation \
@@ -192,8 +192,8 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
ioprio--pidns-translation \
is_linux_mips_n64 \
kcmp-y--pidns-translation \
- kill_child \
kill--pidns-translation \
+ kill_child \
ksysent \
list_sigaction_signum \
localtime \
@@ -206,11 +206,11 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
net-accept-connect \
net-sockaddr--pidns-translation \
net-tpacket_stats-success \
- nlattr_ifla_xdp-y \
netlink_audit--pidns-translation \
netlink_inet_diag \
netlink_netlink_diag \
netlink_unix_diag \
+ nlattr_ifla_xdp-y \
nsyscalls \
nsyscalls-d \
oldselect-P \
@@ -225,12 +225,12 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
poll-P \
ppoll-P \
ppoll-v \
- prlimit64--pidns-translation \
prctl-seccomp-filter-v \
prctl-seccomp-strict \
prctl-spec-inject \
print_maxfd \
print_ppid_tracerpid \
+ prlimit64--pidns-translation \
process_vm_readv--pidns-translation \
process_vm_writev--pidns-translation \
qual_fault \
@@ -264,12 +264,12 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
signal_receive \
signal_receive--pidns-translation \
sleep \
+ so_peercred--pidns-translation \
stack-fcall \
stack-fcall-attach \
stack-fcall-mangled \
status-none-threads \
status-unfinished-threads \
- so_peercred--pidns-translation \
syslog-success \
tgkill--pidns-translation \
threads-execve \
@@ -286,9 +286,9 @@ check_PROGRAMS = $(PURE_EXECUTABLES) \
vfork-f \
wait4-v \
waitid-v \
+ xet_robust_list--pidns-translation \
xetpgid--pidns-translation \
xetpriority--pidns-translation \
- xet_robust_list--pidns-translation \
zeroargc \
# end of check_PROGRAMS
diff --git a/tests/gen_tests.in b/tests/gen_tests.in
index 145851043..0b0f71a57 100644
--- a/tests/gen_tests.in
+++ b/tests/gen_tests.in
@@ -196,10 +196,6 @@ ioctl_evdev +ioctl.test -a26
ioctl_evdev-Xabbrev +ioctl.test -a26 -Xabbrev
ioctl_evdev-Xraw +ioctl.test -a28 -Xraw
ioctl_evdev-Xverbose +ioctl.test -a41 -Xverbose
-ioctl_evdev-v +ioctl.test -a26 -v
-ioctl_evdev-v-Xabbrev +ioctl.test -a26 -v -Xabbrev
-ioctl_evdev-v-Xraw +ioctl.test -a28 -v -Xraw
-ioctl_evdev-v-Xverbose +ioctl.test -a41 -v -Xverbose
ioctl_evdev-success-Xabbrev +ioctl_evdev-success.test -Xabbrev
ioctl_evdev-success-Xraw +ioctl_evdev-success.test -a27 -Xraw
ioctl_evdev-success-Xverbose +ioctl_evdev-success.test -a43 -Xverbose
@@ -207,6 +203,10 @@ ioctl_evdev-success-v +ioctl_evdev-success.test -a26 -v
ioctl_evdev-success-v-Xabbrev +ioctl_evdev-success.test -v -Xabbrev
ioctl_evdev-success-v-Xraw +ioctl_evdev-success.test -a27 -v -Xraw
ioctl_evdev-success-v-Xverbose +ioctl_evdev-success.test -a43 -v -Xverbose
+ioctl_evdev-v +ioctl.test -a26 -v
+ioctl_evdev-v-Xabbrev +ioctl.test -a26 -v -Xabbrev
+ioctl_evdev-v-Xraw +ioctl.test -a28 -v -Xraw
+ioctl_evdev-v-Xverbose +ioctl.test -a41 -v -Xverbose
ioctl_fiemap +ioctl.test
ioctl_fiemap-Xabbrev +ioctl.test -Xabbrev
ioctl_fiemap-Xraw +ioctl.test -Xraw
@@ -235,10 +235,6 @@ ioctl_gpio +ioctl.test
ioctl_gpio-Xabbrev +ioctl.test -Xabbrev
ioctl_gpio-Xraw +ioctl.test -Xraw
ioctl_gpio-Xverbose +ioctl.test -Xverbose
-ioctl_gpio-v +ioctl.test -v
-ioctl_gpio-v-Xabbrev +ioctl.test -v -Xabbrev
-ioctl_gpio-v-Xraw +ioctl.test -v -Xraw
-ioctl_gpio-v-Xverbose +ioctl.test -v -Xverbose
ioctl_gpio-success +ioctl-success.sh -a30
ioctl_gpio-success-Xabbrev +ioctl-success.sh -a30 -Xabbrev
ioctl_gpio-success-Xraw +ioctl-success.sh -a20 -Xraw
@@ -247,14 +243,14 @@ ioctl_gpio-success-v +ioctl-success.sh -a30 -v
ioctl_gpio-success-v-Xabbrev +ioctl-success.sh -a30 -v -Xabbrev
ioctl_gpio-success-v-Xraw +ioctl-success.sh -a20 -v -Xraw
ioctl_gpio-success-v-Xverbose +ioctl-success.sh -a30 -v -Xverbose
+ioctl_gpio-v +ioctl.test -v
+ioctl_gpio-v-Xabbrev +ioctl.test -v -Xabbrev
+ioctl_gpio-v-Xraw +ioctl.test -v -Xraw
+ioctl_gpio-v-Xverbose +ioctl.test -v -Xverbose
ioctl_hdio +ioctl.test -a27
ioctl_hdio-Xabbrev +ioctl.test -a27 -Xabbrev
ioctl_hdio-Xraw +ioctl.test -a20 -Xraw
ioctl_hdio-Xverbose +ioctl.test -a39 -Xverbose
-ioctl_hdio-v +ioctl.test -a27 -v
-ioctl_hdio-v-Xabbrev +ioctl.test -a27 -v -Xabbrev
-ioctl_hdio-v-Xraw +ioctl.test -a20 -v -Xraw
-ioctl_hdio-v-Xverbose +ioctl.test -a39 -v -Xverbose
ioctl_hdio-success +ioctl-success.sh -a27
ioctl_hdio-success-Xabbrev +ioctl-success.sh -a27 -Xabbrev
ioctl_hdio-success-Xraw +ioctl-success.sh -a20 -Xraw
@@ -263,6 +259,10 @@ ioctl_hdio-success-v +ioctl-success.sh -a27 -v
ioctl_hdio-success-v-Xabbrev +ioctl-success.sh -a27 -v -Xabbrev
ioctl_hdio-success-v-Xraw +ioctl-success.sh -a20 -v -Xraw
ioctl_hdio-success-v-Xverbose +ioctl-success.sh -a39 -v -Xverbose
+ioctl_hdio-v +ioctl.test -a27 -v
+ioctl_hdio-v-Xabbrev +ioctl.test -a27 -v -Xabbrev
+ioctl_hdio-v-Xraw +ioctl.test -a20 -v -Xraw
+ioctl_hdio-v-Xverbose +ioctl.test -a39 -v -Xverbose
ioctl_inotify +ioctl.test
ioctl_kvm_run +ioctl.test -a36 -y
ioctl_kvm_run-v +ioctl.test -v -a36 -y
@@ -294,10 +294,6 @@ ioctl_v4l2 +ioctl.test
ioctl_v4l2-Xabbrev +ioctl.test -Xabbrev
ioctl_v4l2-Xraw +ioctl.test -Xraw
ioctl_v4l2-Xverbose +ioctl.test -Xverbose
-ioctl_v4l2-v +ioctl.test -v
-ioctl_v4l2-v-Xabbrev +ioctl.test -v -Xabbrev
-ioctl_v4l2-v-Xraw +ioctl.test -v -Xraw
-ioctl_v4l2-v-Xverbose +ioctl.test -v -Xverbose
ioctl_v4l2-success +ioctl-success.sh -a29
ioctl_v4l2-success-Xabbrev +ioctl-success.sh -a29 -Xabbrev
ioctl_v4l2-success-Xraw +ioctl-success.sh -a27 -Xraw
@@ -306,6 +302,10 @@ ioctl_v4l2-success-v +ioctl-success.sh -a29 -v
ioctl_v4l2-success-v-Xabbrev +ioctl-success.sh -a29 -v -Xabbrev
ioctl_v4l2-success-v-Xraw +ioctl-success.sh -a27 -v -Xraw
ioctl_v4l2-success-v-Xverbose +ioctl-success.sh -a29 -v -Xverbose
+ioctl_v4l2-v +ioctl.test -v
+ioctl_v4l2-v-Xabbrev +ioctl.test -v -Xabbrev
+ioctl_v4l2-v-Xraw +ioctl.test -v -Xraw
+ioctl_v4l2-v-Xverbose +ioctl.test -v -Xverbose
ioctl_watchdog +ioctl.test
ioperm -a27
iopl -a8
@@ -396,10 +396,10 @@ mount-Xverbose -a33 -e trace=mount -Xverbose
move_mount -y
move_mount-P -y -P /dev/full -e trace=move_mount
move_pages -s3
+move_pages--pidns-translation test_pidns -s3 -e trace=move_pages
move_pages-Xabbrev -s3 -e trace=move_pages -Xabbrev
move_pages-Xraw -s3 -a36 -e trace=move_pages -Xraw
move_pages-Xverbose -s3 -e trace=move_pages -Xverbose
-move_pages--pidns-translation test_pidns -s3 -e trace=move_pages
mq -a32 -e trace=mq_getsetattr,mq_open,mq_unlink
mq_sendrecv -a14 -e trace=mq_open,mq_notify,mq_timedsend,mq_timedreceive,mq_unlink
mq_sendrecv-read -eread=0 -a14 -e trace=mq_open,mq_notify,mq_timedsend,mq_timedreceive,mq_unlink
@@ -520,10 +520,10 @@ pidfd_open -a17
pidfd_open--decode-fd-path -a17 -e decode-fd=path -e trace=pidfd_open
pidfd_open--decode-fd-pidfd -a17 -e decode-fd=pidfd -e trace=pidfd_open
pidfd_open--decode-fd-socket -a17 -e decode-fd=socket -e trace=pidfd_open
+pidfd_open--pidns-translation test_pidns -a17 -e trace=pidfd_open
pidfd_open-P -a17 -P /dev/full -e trace=pidfd_open
pidfd_open-y -a17 -y -e trace=pidfd_open
pidfd_open-yy -a17 -yy -e trace=pidfd_open
-pidfd_open--pidns-translation test_pidns -a17 -e trace=pidfd_open
pidfd_send_signal
pidfd_send_signal--pidns-translation test_pidns -e trace=pidfd_send_signal
pipe2 -a15
@@ -674,10 +674,10 @@ sigsuspend -a19 -esignal=none
so_error -e trace=getsockopt
so_linger -e trace=getsockopt,setsockopt
so_peercred -e trace=getsockopt
+so_peercred--pidns-translation test_pidns -e trace=getsockopt
so_peercred-Xabbrev -e trace=getsockopt -Xabbrev
so_peercred-Xraw -e trace=getsockopt -Xraw -a39
so_peercred-Xverbose -e trace=getsockopt -Xverbose
-so_peercred--pidns-translation test_pidns -e trace=getsockopt
sock_filter-v -v -e trace=getsockopt,setsockopt
sock_filter-v-Xabbrev -v -e trace=getsockopt,setsockopt -X abbrev
sock_filter-v-Xraw -a 37 -v -e trace=getsockopt,setsockopt -X raw
@@ -705,38 +705,38 @@ status-unfinished -a10 -e trace=all --status=unfinished
statx -a32 --no-abbrev --trace-path=stat.sample --trace-path=/dev/full
strace--absolute-timestamps +strace-t.test --absolute-timestamps
strace--absolute-timestamps-format-time +strace-t.test --absolute-timestamps=format:time
-strace--absolute-timestamps-format-time-precision-s +strace-t.test --absolute-timestamps=format:time --absolute-timestamps=precision:s
strace--absolute-timestamps-format-time-precision-ms +strace-tt.test 3 --absolute-timestamps=format:time --absolute-timestamps=precision:ms
-strace--absolute-timestamps-format-time-precision-us +strace-tt.test 6 --absolute-timestamps=format:time --absolute-timestamps=precision:us
strace--absolute-timestamps-format-time-precision-ns +strace-tt.test 9 --absolute-timestamps=format:time --absolute-timestamps=precision:ns
-strace--absolute-timestamps-format-unix-precision-s +strace-ttt.test 0 --absolute-timestamps=format:unix --absolute-timestamps=precision:s
+strace--absolute-timestamps-format-time-precision-s +strace-t.test --absolute-timestamps=format:time --absolute-timestamps=precision:s
+strace--absolute-timestamps-format-time-precision-us +strace-tt.test 6 --absolute-timestamps=format:time --absolute-timestamps=precision:us
strace--absolute-timestamps-format-unix-precision-ms +strace-ttt.test 3 --absolute-timestamps=precision:ms --absolute-timestamps=format:unix
-strace--absolute-timestamps-format-unix-precision-us +strace-ttt.test 6 --absolute-timestamps=precision:us --absolute-timestamps=format:unix
strace--absolute-timestamps-format-unix-precision-ns +strace-ttt.test 9 --absolute-timestamps=format:unix --absolute-timestamps=precision:ns
+strace--absolute-timestamps-format-unix-precision-s +strace-ttt.test 0 --absolute-timestamps=format:unix --absolute-timestamps=precision:s
+strace--absolute-timestamps-format-unix-precision-us +strace-ttt.test 6 --absolute-timestamps=precision:us --absolute-timestamps=format:unix
strace--follow-forks-output-separately +strace-ff.test --follow-forks --output-separately
strace--relative-timestamps +strace-r.test --relative-timestamps
-strace--relative-timestamps-s +strace-r.test --relative-timestamps=s
strace--relative-timestamps-ms +strace-r.test --relative-timestamps=ms
-strace--relative-timestamps-us +strace-r.test --relative-timestamps=us
strace--relative-timestamps-ns +strace-r.test --relative-timestamps=ns
-strace--syscall-times +strace-T.test --syscall-times
-strace--syscall-times-s +strace-T.test --syscall-times=s
-strace--syscall-times-ms +strace-T.test --syscall-times=ms
-strace--syscall-times-us +strace-T.test --syscall-times=us
-strace--syscall-times-ns +strace-T.test --syscall-times=ns
+strace--relative-timestamps-s +strace-r.test --relative-timestamps=s
+strace--relative-timestamps-us +strace-r.test --relative-timestamps=us
strace--strings-in-hex --trace=chdir --strings-in-hex --columns=18
strace--strings-in-hex-all --trace=chdir --strings-in-hex=all --columns=18
strace--strings-in-hex-non-ascii --trace=chdir --strings-in-hex=non-ascii --columns=12
+strace--syscall-times +strace-T.test --syscall-times
+strace--syscall-times-ms +strace-T.test --syscall-times=ms
+strace--syscall-times-ns +strace-T.test --syscall-times=ns
+strace--syscall-times-s +strace-T.test --syscall-times=s
+strace--syscall-times-us +strace-T.test --syscall-times=us
strace--timestamps +strace-t.test --timestamps
strace--timestamps-time +strace-t.test --timestamps=time
-strace--timestamps-time-s +strace-t.test --timestamps=time,s
strace--timestamps-time-ms +strace-tt.test 3 --timestamps=time,ms
-strace--timestamps-time-us +strace-tt.test 6 --timestamps=time,us
strace--timestamps-time-ns +strace-tt.test 9 --timestamps=time,ns
-strace--timestamps-unix-s +strace-ttt.test 0 --timestamps=unix,s
+strace--timestamps-time-s +strace-t.test --timestamps=time,s
+strace--timestamps-time-us +strace-tt.test 6 --timestamps=time,us
strace--timestamps-unix-ms +strace-ttt.test 3 --timestamps=unix,ms
-strace--timestamps-unix-us +strace-ttt.test 6 --timestamps=unix,us
strace--timestamps-unix-ns +strace-ttt.test 9 --timestamps=unix,ns
+strace--timestamps-unix-s +strace-ttt.test 0 --timestamps=unix,s
+strace--timestamps-unix-us +strace-ttt.test 6 --timestamps=unix,us
strace-n -e trace=listen -n -qq -a 12
strace-x -e trace=chdir -x -a 12
strace-xx -e trace=chdir -xx -a 18