Commit b269be01 authored by Vagrant Cascadian's avatar Vagrant Cascadian
Browse files

reproducible debian: Hard-code the diffoscope timeout rather than 

calculating it.

Sometimes diffoscope is getting pass an empty argument to --timeout:

  diffoscope: error: unrecognized arguments: --timeout /srv/reproducible-results/rbuild-debian/tmp.2dVDO4MyJG/b2/python-circuitbreaker_1.3.2-2_amd64.changes
parent 3b35663a

bin/reproducible_build.sh

+2 −2
Original line number Diff line number Diff line
@@ -368,13 +368,13 @@ call_diffoscope_on_changes_files() { 
	log_info "$DIFFOSCOPE will be used to compare the two builds:"

	set -x

	set +e

	# the --timeout 90m below is arbitrary and can be subject to further evaluation later

	# the --timeout 5400 (e.g. 90 minutes) below is arbitrary and can be subject to further evaluation later

	( timeout 125m nice schroot \

		--directory $TMPDIR \

		--run-session \

		-c "$session" \

		-- sh -c "export TMPDIR=$TEMP ; timeout $TIMEOUT diffoscope \

			--timeout $(( 90 * 60 )) \

			--timeout 5400 \

			--html $TMPDIR/${DBDREPORT} \

			--text $TMPDIR/$DBDTXT \

			--json $TMPDIR/$DBDJSON \