Skip to content

Commit 07ad6ec

Browse files
Fix Go test in non isolate mode. Don't delete files with the same extension.
1 parent 1fba1d4 commit 07ad6ec

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

generate_json.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@ def parse_lang_properties(lang_properties):
6161
}
6262

6363
if language["COMPILE_CMD"] != "":
64-
cleaned_language["compile_cmd"] = language["COMPILE_CMD"]
64+
compile_cmd = language["COMPILE_CMD"]
65+
if "COMPILE_CMD_ISOLATE" in language:
66+
compile_cmd = language["COMPILE_CMD_ISOLATE"]
67+
cleaned_language["compile_cmd"] = compile_cmd
6568

6669
run_cmd = language["RUN_CMD"]
6770
if "RUN_CMD_ISOLATE" in language:

tests/go/lang.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ VERSIONS="1.13.5"
22
NAME="Go ($VERSION)"
33
SOURCE_FILE="main.go"
44
BINARY_FILE="main"
5-
COMPILE_CMD="GOCACHE=/tmp/.cache/go-build /usr/local/go-$VERSION/bin/go build $ARGS $SOURCE_FILE"
5+
COMPILE_CMD="/usr/local/go-$VERSION/bin/go build $ARGS $SOURCE_FILE"
6+
COMPILE_CMD_ISOLATE="GOCACHE=/tmp/.cache/go-build /usr/local/go-$VERSION/bin/go build $ARGS $SOURCE_FILE"
67
RUN_CMD="./$BINARY_FILE"

tests/run

+5-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ for directory in *; do
5555
cp $SOURCE_FILE $boxdir
5656

5757
if [[ $COMPILE_CMD != "" ]]; then
58+
if [[ $COMPILE_CMD_ISOLATE != "" ]]; then
59+
COMPILE_CMD=$COMPILE_CMD_ISOLATE
60+
unset COMPILE_CMD_ISOLATE
61+
fi
5862
echo $COMPILE_CMD > $boxdir/compile
5963

6064
echo "Compiling inside isolate."
@@ -101,7 +105,7 @@ for directory in *; do
101105
else
102106
$COMPILE_CMD
103107
echo "world" | bash -c "$RUN_CMD"
104-
rm $(ls . | grep -v $SOURCE_FILE | grep -v $LANG_PROPERTIES_FILE) &> /dev/null || true
108+
rm $(ls . | grep -v \.${SOURCE_FILE##*.} | grep -v $LANG_PROPERTIES_FILE) &> /dev/null || true
105109
fi
106110

107111
cd ..

0 commit comments

Comments
 (0)