##// END OF EJS Templates
ci: drop the HGMODULEPOLICY overwrite...
marmoute -
r52852:88715d0b stable
parent child Browse files
Show More
@@ -26,7 +26,6 image: registry.heptapod.net/mercurial/c
26
26
27 variables:
27 variables:
28 PYTHON: python
28 PYTHON: python
29 TEST_HGMODULEPOLICY: "allow"
30 HG_CI_IMAGE_TAG: "v1.0"
29 HG_CI_IMAGE_TAG: "v1.0"
31 TEST_HGTESTS_ALLOW_NETIO: "0"
30 TEST_HGTESTS_ALLOW_NETIO: "0"
32
31
@@ -49,7 +48,7 variables:
49 - echo "python used, $PYTHON"
48 - echo "python used, $PYTHON"
50 - $PYTHON --version
49 - $PYTHON --version
51 - echo "$RUNTEST_ARGS"
50 - echo "$RUNTEST_ARGS"
52 - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
51 - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
53
52
54 checks:
53 checks:
55 <<: *runtests
54 <<: *runtests
@@ -74,7 +73,6 test-c:
74 variables:
73 variables:
75 RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
74 RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
76 PYTHON: python3
75 PYTHON: python3
77 TEST_HGMODULEPOLICY: "c"
78 TEST_HGTESTS_ALLOW_NETIO: "1"
76 TEST_HGTESTS_ALLOW_NETIO: "1"
79
77
80 test-pure:
78 test-pure:
@@ -82,7 +80,6 test-pure:
82 variables:
80 variables:
83 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
81 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
84 PYTHON: python3
82 PYTHON: python3
85 TEST_HGMODULEPOLICY: "py"
86
83
87 test-rust:
84 test-rust:
88 <<: *runtests
85 <<: *runtests
@@ -90,7 +87,6 test-rust:
90 HGWITHRUSTEXT: cpython
87 HGWITHRUSTEXT: cpython
91 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
88 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
92 PYTHON: python3
89 PYTHON: python3
93 TEST_HGMODULEPOLICY: "rust+c"
94
90
95 test-rhg:
91 test-rhg:
96 <<: *runtests
92 <<: *runtests
@@ -98,14 +94,12 test-rhg:
98 HGWITHRUSTEXT: cpython
94 HGWITHRUSTEXT: cpython
99 RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt"
95 RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt"
100 PYTHON: python3
96 PYTHON: python3
101 TEST_HGMODULEPOLICY: "rust+c"
102
97
103 test-chg:
98 test-chg:
104 <<: *runtests
99 <<: *runtests
105 variables:
100 variables:
106 PYTHON: python3
101 PYTHON: python3
107 RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
102 RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
108 TEST_HGMODULEPOLICY: "c"
109
103
110 check-pytype:
104 check-pytype:
111 extends: .runtests_template
105 extends: .runtests_template
@@ -144,14 +138,13 check-pytype:
144 - echo "$Env:TMP"
138 - echo "$Env:TMP"
145 - echo "$Env:TEMP"
139 - echo "$Env:TEMP"
146
140
147 - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON tests/run-tests.py --color=always $RUNTEST_ARGS'
141 - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" $PYTHON tests/run-tests.py --color=always $RUNTEST_ARGS'
148
142
149 windows:
143 windows:
150 <<: *windows_runtests
144 <<: *windows_runtests
151 tags:
145 tags:
152 - windows
146 - windows
153 variables:
147 variables:
154 TEST_HGMODULEPOLICY: "c"
155 RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt"
148 RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt"
156 PYTHON: py -3
149 PYTHON: py -3
157
150
@@ -160,6 +153,5 windows-pyox:
160 tags:
153 tags:
161 - windows
154 - windows
162 variables:
155 variables:
163 TEST_HGMODULEPOLICY: "c"
164 RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt --pyoxidized"
156 RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt --pyoxidized"
165 PYTHON: py -3
157 PYTHON: py -3
General Comments 0
You need to be logged in to leave comments. Login now