=== modified file 'britney'
--- britney 2016-04-22 08:31:25 +0000
+++ britney 2016-05-19 13:53:52 +0000
@@ -392,10 +392,28 @@
esac
}
+make_b2_notest_config () {
+ sed -e '/^NONINST_STATUS/ s/ *$/-notest/' \
+ -e '/^EXCUSES_.*OUTPUT/ s%=.*$%= /dev/null%' \
+ -e '/^UPGRADE_OUTPUT/ s/output.txt/output_notest.txt/' \
+ -e '/^HEIDI_OUTPUT/ s/=.*$/=/' \
+ -e '/^ADT_ENABLE/ s/yes/no/' \
+ "$1" > "$2"
+}
+
run_b2 () {
cd $BASE
make_b2_config "$B2_CONFIG" "$B2_CONFIG.$DISTRIBUTION.$SERIES"
$CODE_B2/britney.py -c "$B2_CONFIG.$DISTRIBUTION.$SERIES" -v --distribution=$DISTRIBUTION --series=$SERIES
+
+ if [ "$SERIES" = "$DEFAULT_SERIES" ]; then
+ # for the devel series we also want an output.txt without tests, to make
+ # it easier to untangle library transitions
+ make_b2_notest_config "$B2_CONFIG.$DISTRIBUTION.$SERIES" "$B2_CONFIG.$DISTRIBUTION.$SERIES.notest"
+ $CODE_B2/britney.py -c "$B2_CONFIG.$DISTRIBUTION.$SERIES.notest" --distribution=$DISTRIBUTION --series=$SERIES >/dev/null
+ else
+ rm -f $DATA_B2/output/$SERIES/output_notest.txt
+ fi
}
if option run; then
@@ -468,6 +486,11 @@
cp $DATA_B2/output/$SERIES/excuses.html $HTML/$SERIES/update_excuses.html
cp $DATA_B2/output/$SERIES/excuses.yaml $HTML/$SERIES/update_excuses.yaml
cp $DATA_B2/output/$SERIES/output.txt $HTML/$SERIES/update_output.txt
+ if [ -e $DATA_B2/output/$SERIES/output_notest.txt ]; then
+ cp $DATA_B2/output/$SERIES/output_notest.txt $HTML/$SERIES/update_output_notest.txt
+ else
+ rm -f $HTML/$SERIES/update_output_notest.txt
+ fi
cp $DATA_B2/$SERIES-proposed/Blocks $HTML/$SERIES/blocks.txt
fi
#gzip -9 < $HTML/$SERIES/update_excuses.html > $HTML/$SERIES/update_excuses.html.gz