File tree Expand file tree Collapse file tree 5 files changed +33
-9
lines changed Expand file tree Collapse file tree 5 files changed +33
-9
lines changed Original file line number Diff line number Diff line change @@ -17,5 +17,9 @@ total_mem_restricted=$((total_mem- mem_threshold))
17
17
num_workers=2
18
18
export JULIA_TEST_MAXRSS_MB=$(( total_mem_restricted/ num_workers))
19
19
20
+ # max-moving vs non-moving
21
+ is_moving=$2
22
+ moving_feature=${is_moving,,}
23
+
20
24
echo " -> Run single threaded"
21
- ci_run_jl_test " LinearAlgebra" 2
25
+ ci_run_jl_test " LinearAlgebra" 2 $moving_feature
Original file line number Diff line number Diff line change @@ -13,6 +13,10 @@ CHOOSE_TESTS_JL_CONTENT=`cat $CHOOSE_TESTS_JL_PATH`
13
13
14
14
REGEX_PATTERN=' .*const TESTNAMES = \[([^\[]*)^\].*'
15
15
16
+ # max-moving vs non-moving
17
+ is_moving=$2
18
+ moving_feature=${is_moving,,}
19
+
16
20
if [[ $CHOOSE_TESTS_JL_CONTENT =~ $REGEX_PATTERN ]]; then
17
21
RAW_TEST_NAMES=${BASH_REMATCH[1]}
18
22
@@ -40,7 +44,7 @@ if [[ $CHOOSE_TESTS_JL_CONTENT =~ $REGEX_PATTERN ]]; then
40
44
fi
41
45
42
46
echo " -> Run"
43
- ci_run_jl_test $test
47
+ ci_run_jl_test $test 1 $moving_feature
44
48
fi
45
49
done
46
50
else
Original file line number Diff line number Diff line change @@ -51,6 +51,10 @@ if [ $(find $stdlib_path -mindepth 1 -maxdepth 1 | wc -l) -ne 1 ]; then
51
51
exit 1
52
52
fi
53
53
54
+ # max-moving vs non-moving
55
+ is_moving=$2
56
+ moving_feature=${is_moving,,}
57
+
54
58
for dir in $( find $stdlib_version_path -depth -mindepth 1 -type d -o -type l)
55
59
do
56
60
# if there is a runtests.jl, we run it.
67
71
68
72
if [[ " ${tests_with_multi_workers[@]} " =~ " $test " ]]; then
69
73
echo " -> Run multi threaded"
70
- ci_run_jl_test $test 2
74
+ ci_run_jl_test $test 2 $moving_feature
71
75
continue
72
76
fi
73
77
74
78
if [[ " ${tests_with_single_worker[@]} " =~ " $test " ]]; then
75
79
echo " -> Run single threaded"
76
- ci_run_jl_test $test 1
80
+ ci_run_jl_test $test 1 $moving_feature
77
81
continue
78
82
fi
79
83
80
- ci_run_jl_test $test
84
+ ci_run_jl_test $test 1 $moving_feature
81
85
fi
82
86
done
Original file line number Diff line number Diff line change @@ -17,6 +17,18 @@ export JULIA_TEST_MAXRSS_MB=$total_mem
17
17
ci_run_jl_test () {
18
18
test=$1
19
19
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
20
32
21
33
# if no argument is given, use 2 as default
22
34
if [ -z " $threads " ]; then
@@ -30,5 +42,5 @@ ci_run_jl_test() {
30
42
# $JULIA_PATH/julia $JULIA_TEST_ARGS $JULIA_PATH/test/runtests.jl --exit-on-error $test
31
43
32
44
# 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
34
46
}
Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ jobs:
110
110
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
111
111
- name : Test Julia
112
112
run : |
113
- ./.github/scripts/ci-test-other.sh ${{ inputs.gc_plan }}
113
+ ./.github/scripts/ci-test-other.sh ${{ inputs.gc_plan }} ${{ inputs.moving }}
114
114
115
115
build-test-stdlib :
116
116
runs-on : ubuntu-22.04
@@ -136,7 +136,7 @@ jobs:
136
136
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
137
137
- name : Test Julia
138
138
run : |
139
- ./.github/scripts/ci-test-stdlib.sh ${{ inputs.gc_plan }}
139
+ ./.github/scripts/ci-test-stdlib.sh ${{ inputs.gc_plan }} ${{ inputs.moving }}
140
140
141
141
build-test-LinearAlgebra :
142
142
runs-on : ubuntu-22.04
@@ -159,4 +159,4 @@ jobs:
159
159
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
160
160
- name : Test Julia
161
161
run : |
162
- ./.github/scripts/ci-test-LinearAlgebra.sh ${{ inputs.gc_plan }}
162
+ ./.github/scripts/ci-test-LinearAlgebra.sh ${{ inputs.gc_plan }} ${{ inputs.moving }}
You can’t perform that action at this time.
0 commit comments