Attachment #4930 for bug #15376

View | Details | Raw Unified | Return to bug 15376
Collapse All | Expand All

Lines 50-55 Options: Link Here

(-)a/hasher/hsh (+6 lines)
50	--no-cache do not use initroot cache;	50	--no-cache do not use initroot cache;
51	--no-contents-indices do not use content indices;	51	--no-contents-indices do not use content indices;
52	--no-repackage-source do not repackage source along with binaries;	52	--no-repackage-source do not repackage source along with binaries;
		53	--check-program=CHECK_PROGRAM run specific program as sisyphus_check;
53	--no-sisyphus-check-in[=LIST] do not run sisyphus_check input tests	54	--no-sisyphus-check-in[=LIST] do not run sisyphus_check input tests
54	[specified in comma-separated LIST];	55	[specified in comma-separated LIST];
55	--no-sisyphus-check[=LIST] do not run sisyphus_check tests	56	--no-sisyphus-check[=LIST] do not run sisyphus_check tests
Lines 97-102 eval set -- "$TEMP" Link Here
97		98
98	cleanup_only=	99	cleanup_only=
99	initroot_only=	100	initroot_only=
		101	check_program=
100	while :; do	102	while :; do
101	case "$1" in	103	case "$1" in
102	--apt-config)	104	--apt-config)
Lines 135-140 while :; do Link Here
135	;;	137	;;
136	--no-repackage-source\|--repackage-source) repackage_source="$1"	138	--no-repackage-source\|--repackage-source) repackage_source="$1"
137	;;	139	;;
		140	--check-program) shift
		141	[ -x "$1" ] && check_program="$1"
		142	;;
138	--no-sisyphus-check) shift	143	--no-sisyphus-check) shift
139	[ -n "$1" ] && no_sisyphus_check="$1" \|\| no_sisyphus_check=all	144	[ -n "$1" ] && no_sisyphus_check="$1" \|\| no_sisyphus_check=all
140	;;	145	;;
Lines 370-375 handle_package() Link Here
370	${no_stuff:+--no-stuff} \	375	${no_stuff:+--no-stuff} \
371	${exclude_docs:+--excludedocs} \	376	${exclude_docs:+--excludedocs} \
372	${save_fakeroot:+--save-fakeroot} \	377	${save_fakeroot:+--save-fakeroot} \
		378	${check_program:+--check-program="$check_program"} \
373	${no_sisyphus_check:+--no-sisyphus-check="$no_sisyphus_check"} \	379	${no_sisyphus_check:+--no-sisyphus-check="$no_sisyphus_check"} \
374	${no_sisyphus_check_in:+--no-sisyphus-check-in="$no_sisyphus_check_in"} \	380	${no_sisyphus_check_in:+--no-sisyphus-check-in="$no_sisyphus_check_in"} \
375	${no_sisyphus_check_out:+--no-sisyphus-check-out="$no_sisyphus_check_out"} \	381	${no_sisyphus_check_out:+--no-sisyphus-check-out="$no_sisyphus_check_out"} \

Lines 38-43 Options: Link Here

(-)a/hasher/hsh-rebuild (+9 lines)
38	--install-only do not build, stop after installing build dependencies;	38	--install-only do not build, stop after installing build dependencies;
39	--mountpoints=LIST comma-separated list of known mount points;	39	--mountpoints=LIST comma-separated list of known mount points;
40	--nodeps ignore package dependencies (dangerous);	40	--nodeps ignore package dependencies (dangerous);
		41	--check-program=CHECK_PROGRAM run specific program as sisyphus_check;
41	--no-sisyphus-check-in[=LIST] do not run sisyphus_check input tests [specified in LIST];	42	--no-sisyphus-check-in[=LIST] do not run sisyphus_check input tests [specified in LIST];
42	--no-sisyphus-check[=LIST] do not run sisyphus_check tests [specified in LIST];	43	--no-sisyphus-check[=LIST] do not run sisyphus_check tests [specified in LIST];
43	--no-sisyphus-check-out[=LIST] do not run sisyphus_check output tests [specified in LIST];	44	--no-sisyphus-check-out[=LIST] do not run sisyphus_check output tests [specified in LIST];
Lines 74-79 eval set -- "$TEMP" Link Here
74	nodeps=	75	nodeps=
75	install_only=	76	install_only=
76	source_only=	77	source_only=
		78	check_program=
77	while :; do	79	while :; do
78	case "$1" in	80	case "$1" in
79	--args) shift; rpmargs="$1"	81	--args) shift; rpmargs="$1"
Lines 92-97 while :; do Link Here
92	;;	94	;;
93	--no-lock) no_lock=1	95	--no-lock) no_lock=1
94	;;	96	;;
		97	--check-program) shift
		98	[ -x "$1" ] && check_program="$1"
		99	;;
95	--no-sisyphus-check) shift	100	--no-sisyphus-check) shift
96	[ -n "$1" ] && no_sisyphus_check="$1" \|\| no_sisyphus_check=all	101	[ -n "$1" ] && no_sisyphus_check="$1" \|\| no_sisyphus_check=all
97	;;	102	;;
Lines 149-154 if [ -n "$prog_query_req" -a -n "$query_repackage" ]; then Link Here
149	show_usage '--query-req-prog and --query-repackage are mutually exclusive options.'	154	show_usage '--query-req-prog and --query-repackage are mutually exclusive options.'
150	fi	155	fi
151		156
		157	if [ -z "$check_program" ]; then
		158	check_program=${SISYPHUS_CHECK-sisyphus_check}
		159	fi
		160
152	if [ -z "$workdir" ]; then	161	if [ -z "$workdir" ]; then
153	# Exactly two arguments.	162	# Exactly two arguments.
154	[ "$#" -ge 2 ] \|\| show_usage 'Insufficient arguments.'	163	[ "$#" -ge 2 ] \|\| show_usage 'Insufficient arguments.'

Lines 197-203 run_sisyphus_check() Link Here

(-)a/hasher/hsh-sh-rebuild-functions (-1 / +1 lines)
197		197
198	create_entry_header	198	create_entry_header
199	cat >>"$entry" <<__EOF__	199	cat >>"$entry" <<__EOF__
200	sisyphus_check --no-check="$(quote_shell "$no_check")" "$dir"	200	$check_program --no-check="$(quote_shell "$no_check")" "$dir"
201	__EOF__	201	__EOF__
202		202
203	wlimit_time_elapsed=$wlimit_time_long wlimit_time_idle=$wlimit_time_long wlimit_bytes_written=$wlimit_bytes_out \	203	wlimit_time_elapsed=$wlimit_time_long wlimit_time_idle=$wlimit_time_long wlimit_bytes_written=$wlimit_bytes_out \

Return to bug 15376