Skip to content

Commit 25035f7

Browse files
committed
Adding moving vars to make sure with run the tests with the correct version
1 parent 98b313e commit 25035f7

File tree

5 files changed

+33
-9
lines changed

5 files changed

+33
-9
lines changed

.github/scripts/ci-test-LinearAlgebra.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,9 @@ total_mem_restricted=$((total_mem- mem_threshold))
1717
num_workers=2
1818
export JULIA_TEST_MAXRSS_MB=$((total_mem_restricted/ num_workers))
1919

20+
# max-moving vs non-moving
21+
is_moving=$2
22+
moving_feature=${is_moving,,}
23+
2024
echo "-> Run single threaded"
21-
ci_run_jl_test "LinearAlgebra" 2
25+
ci_run_jl_test "LinearAlgebra" 2 $moving_feature

.github/scripts/ci-test-other.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ CHOOSE_TESTS_JL_CONTENT=`cat $CHOOSE_TESTS_JL_PATH`
1313

1414
REGEX_PATTERN='.*const TESTNAMES = \[([^\[]*)^\].*'
1515

16+
# max-moving vs non-moving
17+
is_moving=$2
18+
moving_feature=${is_moving,,}
19+
1620
if [[ $CHOOSE_TESTS_JL_CONTENT =~ $REGEX_PATTERN ]]; then
1721
RAW_TEST_NAMES=${BASH_REMATCH[1]}
1822

@@ -40,7 +44,7 @@ if [[ $CHOOSE_TESTS_JL_CONTENT =~ $REGEX_PATTERN ]]; then
4044
fi
4145
4246
echo "-> Run"
43-
ci_run_jl_test $test
47+
ci_run_jl_test $test 1 $moving_feature
4448
fi
4549
done
4650
else

.github/scripts/ci-test-stdlib.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ if [ $(find $stdlib_path -mindepth 1 -maxdepth 1 | wc -l) -ne 1 ]; then
5151
exit 1
5252
fi
5353

54+
# max-moving vs non-moving
55+
is_moving=$2
56+
moving_feature=${is_moving,,}
57+
5458
for dir in $(find $stdlib_version_path -depth -mindepth 1 -type d -o -type l)
5559
do
5660
# if there is a runtests.jl, we run it.
@@ -67,16 +71,16 @@ do
6771

6872
if [[ "${tests_with_multi_workers[@]}" =~ "$test" ]]; then
6973
echo "-> Run multi threaded"
70-
ci_run_jl_test $test 2
74+
ci_run_jl_test $test 2 $moving_feature
7175
continue
7276
fi
7377

7478
if [[ "${tests_with_single_worker[@]}" =~ "$test" ]]; then
7579
echo "-> Run single threaded"
76-
ci_run_jl_test $test 1
80+
ci_run_jl_test $test 1 $moving_feature
7781
continue
7882
fi
7983

80-
ci_run_jl_test $test
84+
ci_run_jl_test $test 1 $moving_feature
8185
fi
8286
done

.github/scripts/common.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,18 @@ export JULIA_TEST_MAXRSS_MB=$total_mem
1717
ci_run_jl_test() {
1818
test=$1
1919
threads=$2
20+
moving_feature=$3
21+
22+
23+
if [ "$moving_feature" == "max_moving" ]; then
24+
MOVING=1
25+
ALWAYS_MOVING=1
26+
MAX_MOVING=1
27+
else
28+
MOVING=0
29+
ALWAYS_MOVING=0
30+
MAX_MOVING=0
31+
fi
2032

2133
# if no argument is given, use 2 as default
2234
if [ -z "$threads" ]; then
@@ -30,5 +42,5 @@ ci_run_jl_test() {
3042
# $JULIA_PATH/julia $JULIA_TEST_ARGS $JULIA_PATH/test/runtests.jl --exit-on-error $test
3143

3244
# Run with their build script
33-
make test-$test
45+
MMTK_MOVING=$MOVING MMTK_ALWAYS_MOVING=$ALWAYS_MOVING MMTK_MAX_MOVING=$MAX_MOVING make test-$test
3446
}

.github/workflows/binding-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
111111
- name: Test Julia
112112
run: |
113-
./.github/scripts/ci-test-other.sh ${{ inputs.gc_plan }}
113+
./.github/scripts/ci-test-other.sh ${{ inputs.gc_plan }} ${{ inputs.moving }}
114114
115115
build-test-stdlib:
116116
runs-on: ubuntu-22.04
@@ -136,7 +136,7 @@ jobs:
136136
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
137137
- name: Test Julia
138138
run: |
139-
./.github/scripts/ci-test-stdlib.sh ${{ inputs.gc_plan }}
139+
./.github/scripts/ci-test-stdlib.sh ${{ inputs.gc_plan }} ${{ inputs.moving }}
140140
141141
build-test-LinearAlgebra:
142142
runs-on: ubuntu-22.04
@@ -159,4 +159,4 @@ jobs:
159159
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
160160
- name: Test Julia
161161
run: |
162-
./.github/scripts/ci-test-LinearAlgebra.sh ${{ inputs.gc_plan }}
162+
./.github/scripts/ci-test-LinearAlgebra.sh ${{ inputs.gc_plan }} ${{ inputs.moving }}

0 commit comments

Comments
 (0)