Skip to content

Commit 377d1fa

Browse files
committed
Remove the generated files by update-references.sh if they are empty
1 parent 7118d37 commit 377d1fa

File tree

4 files changed

+30
-1
lines changed

4 files changed

+30
-1
lines changed

doc/adding_lints.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,8 @@ every time before running `tests/ui/update-all-references.sh`.
104104
Running `TESTNAME=foo_functions cargo uitest` should pass then. When we commit
105105
our lint, we need to commit the generated `.stderr` files, too. In general, you
106106
should only commit files changed by `tests/ui/update-all-references.sh` for the
107-
specific lint you are creating/editing.
107+
specific lint you are creating/editing. Note that if the generated files are
108+
empty, they should be removed.
108109

109110
### Cargo lints
110111

tests/ui-cargo/update-references.sh

+8
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,18 @@ while [[ "$1" != "" ]]; do
2929
! (cmp -s -- "$BUILD_DIR"/"$STDOUT_NAME" "$MYDIR"/"$STDOUT_NAME"); then
3030
echo updating "$MYDIR"/"$STDOUT_NAME"
3131
cp "$BUILD_DIR"/"$STDOUT_NAME" "$MYDIR"/"$STDOUT_NAME"
32+
if [[ ! -s "$MYDIR"/"$STDOUT_NAME" ]]; then
33+
echo removing "$MYDIR"/"$STDOUT_NAME"
34+
rm "$MYDIR"/"$STDOUT_NAME"
35+
fi
3236
fi
3337
if [[ -f "$BUILD_DIR"/"$STDERR_NAME" ]] && \
3438
! (cmp -s -- "$BUILD_DIR"/"$STDERR_NAME" "$MYDIR"/"$STDERR_NAME"); then
3539
echo updating "$MYDIR"/"$STDERR_NAME"
3640
cp "$BUILD_DIR"/"$STDERR_NAME" "$MYDIR"/"$STDERR_NAME"
41+
if [[ ! -s "$MYDIR"/"$STDERR_NAME" ]]; then
42+
echo removing "$MYDIR"/"$STDERR_NAME"
43+
rm "$MYDIR"/"$STDERR_NAME"
44+
fi
3745
fi
3846
done

tests/ui-toml/update-references.sh

+8
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,18 @@ while [[ "$1" != "" ]]; do
2929
! (cmp -s -- "$BUILD_DIR"/"$STDOUT_NAME" "$MYDIR"/"$STDOUT_NAME"); then
3030
echo updating "$MYDIR"/"$STDOUT_NAME"
3131
cp "$BUILD_DIR"/"$STDOUT_NAME" "$MYDIR"/"$STDOUT_NAME"
32+
if [[ ! -s "$MYDIR"/"$STDOUT_NAME" ]]; then
33+
echo removing "$MYDIR"/"$STDOUT_NAME"
34+
rm "$MYDIR"/"$STDOUT_NAME"
35+
fi
3236
fi
3337
if [[ -f "$BUILD_DIR"/"$STDERR_NAME" ]] && \
3438
! (cmp -s -- "$BUILD_DIR"/"$STDERR_NAME" "$MYDIR"/"$STDERR_NAME"); then
3539
echo updating "$MYDIR"/"$STDERR_NAME"
3640
cp "$BUILD_DIR"/"$STDERR_NAME" "$MYDIR"/"$STDERR_NAME"
41+
if [[ ! -s "$MYDIR"/"$STDERR_NAME" ]]; then
42+
echo removing "$MYDIR"/"$STDERR_NAME"
43+
rm "$MYDIR"/"$STDERR_NAME"
44+
fi
3745
fi
3846
done

tests/ui/update-references.sh

+12
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,27 @@ while [[ "$1" != "" ]]; do
3030
! (cmp -s -- "$BUILD_DIR"/"$STDOUT_NAME" "$MYDIR"/"$STDOUT_NAME"); then
3131
echo updating "$MYDIR"/"$STDOUT_NAME"
3232
cp "$BUILD_DIR"/"$STDOUT_NAME" "$MYDIR"/"$STDOUT_NAME"
33+
if [[ ! -s "$MYDIR"/"$STDOUT_NAME" ]]; then
34+
echo removing "$MYDIR"/"$STDOUT_NAME"
35+
rm "$MYDIR"/"$STDOUT_NAME"
36+
fi
3337
fi
3438
if [[ -f "$BUILD_DIR"/"$STDERR_NAME" ]] && \
3539
! (cmp -s -- "$BUILD_DIR"/"$STDERR_NAME" "$MYDIR"/"$STDERR_NAME"); then
3640
echo updating "$MYDIR"/"$STDERR_NAME"
3741
cp "$BUILD_DIR"/"$STDERR_NAME" "$MYDIR"/"$STDERR_NAME"
42+
if [[ ! -s "$MYDIR"/"$STDERR_NAME" ]]; then
43+
echo removing "$MYDIR"/"$STDERR_NAME"
44+
rm "$MYDIR"/"$STDERR_NAME"
45+
fi
3846
fi
3947
if [[ -f "$BUILD_DIR"/"$FIXED_NAME" ]] && \
4048
! (cmp -s -- "$BUILD_DIR"/"$FIXED_NAME" "$MYDIR"/"$FIXED_NAME"); then
4149
echo updating "$MYDIR"/"$FIXED_NAME"
4250
cp "$BUILD_DIR"/"$FIXED_NAME" "$MYDIR"/"$FIXED_NAME"
51+
if [[ ! -s "$MYDIR"/"$FIXED_NAME" ]]; then
52+
echo removing "$MYDIR"/"$FIXED_NAME"
53+
rm "$MYDIR"/"$FIXED_NAME"
54+
fi
4355
fi
4456
done

0 commit comments

Comments
 (0)