Skip to content

Commit 96a0898

Browse files
garbastgarbast
committed
[TASK] Update test scripts
1 parent 1c17637 commit 96a0898

2 files changed

Lines changed: 43 additions & 44 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ jobs:
2323
run: Build/Scripts/additionalTests.sh -s buildDocumentation
2424

2525
- name: Cleanup
26-
run: |
27-
Build/Scripts/runTests.sh -s clean
28-
Build/Scripts/additionalTests.sh -s clean
29-
git checkout composer.json
26+
run: Build/Scripts/additionalTests.sh -s clean
3027

3128
testsuite:
3229
name: All php tests
@@ -35,52 +32,61 @@ jobs:
3532
matrix:
3633
packages:
3734
- php: '8.2'
38-
core: '^13.0'
35+
core: '^14.0'
3936
framework: 'dev-main'
4037
prefer: ''
38+
testpath: 'Tests/Functional'
39+
4140
- php: '8.2'
42-
core: '^13.0'
41+
core: '^14.0'
4342
framework: 'dev-main'
4443
prefer: '--prefer-lowest'
44+
testpath: 'Tests/Functional'
45+
4546
- php: '8.3'
46-
core: '^13.0'
47+
core: '^14.0'
4748
framework: 'dev-main'
4849
prefer: ''
50+
testpath: 'Tests/Functional'
51+
4952
- php: '8.3'
50-
core: '^13.0'
53+
core: '^14.0'
5154
framework: 'dev-main'
5255
prefer: '--prefer-lowest'
56+
testpath: 'Tests/Functional'
57+
58+
- php: '8.4'
59+
core: '^14.0'
60+
framework: 'dev-main'
61+
prefer: ''
62+
testpath: 'Tests/Functional'
63+
64+
# - php: '8.4'
65+
# core: '^14.0'
66+
# framework: 'dev-main'
67+
# prefer: '--prefer-lowest'
68+
# testpath: 'Tests/Functional'
5369
steps:
5470
- name: Checkout
5571
uses: actions/checkout@v4
5672

5773
- name: Lint php
58-
run: |
59-
Build/Scripts/additionalTests.sh \
60-
-p ${{ matrix.packages.php }} \
61-
-s lintPhp
62-
63-
- name: Composer install
6474
run: |
6575
Build/Scripts/runTests.sh \
6676
-p ${{ matrix.packages.php }} \
67-
-s composerInstall
77+
-s lintPhp
6878
6979
- name: Composer install core
7080
run: |
71-
Build/Scripts/additionalTests.sh \
81+
Build/Scripts/runTests.sh \
7282
-p ${{ matrix.packages.php }} \
73-
-s composerInstallPackage \
74-
-q "typo3/cms-core:${{ matrix.packages.core }}" \
75-
-r " ${{ matrix.packages.prefer }}"
83+
-s composer require ${{ matrix.packages.prefer }} "typo3/cms-core:${{ matrix.packages.core }}"
7684
7785
- name: Composer install framework
7886
run: |
79-
Build/Scripts/additionalTests.sh \
87+
Build/Scripts/runTests.sh \
8088
-p ${{ matrix.packages.php }} \
81-
-s composerInstallPackage \
82-
-q "typo3/testing-framework:${{ matrix.packages.framework }}" \
83-
-r " --dev ${{ matrix.packages.prefer }}"
89+
-s composer require --dev ${{ matrix.packages.prefer }} "typo3/testing-framework:${{ matrix.packages.framework }}"
8490
8591
- name: Composer validate
8692
run: |
@@ -92,7 +98,6 @@ jobs:
9298
run: |
9399
Build/Scripts/runTests.sh -s clean
94100
Build/Scripts/additionalTests.sh -s clean
95-
git checkout composer.json
96101
97102
TERUpload:
98103
needs: [ resources, testsuite ]

‎Build/Scripts/test.sh‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ cd "$THIS_SCRIPT_DIR" || exit 1
1313
# none
1414
#################################################
1515
checkResources () {
16+
clear
1617
echo "#################################################################" >&2
17-
echo " Checking documentation, TypeScript and Scss files" >&2
18+
echo " Checking documentation, TypeScript, Scss and Xliff files" >&2
1819
echo "#################################################################" >&2
20+
echo "" >&2
1921

2022
# ./additionalTests.sh -s lintScss
2123
# EXIT_CODE_SCSS=$?
@@ -30,7 +32,7 @@ checkResources () {
3032
EXIT_CODE_DOCUMENTATION=$?
3133

3234
echo "#################################################################" >&2
33-
echo " Checked documentation, TypeScript and Scss files" >&2
35+
echo " Checked documentation, TypeScript, Scss and Xliff files" >&2
3436
if [[ ${EXIT_CODE_SCSS} -eq 0 ]] && \
3537
[[ ${EXIT_CODE_TYPESCRIPT} -eq 0 ]] && \
3638
[[ ${EXIT_CODE_XLIFF} -eq 0 ]] && \
@@ -43,7 +45,7 @@ checkResources () {
4345
echo "#################################################################" >&2
4446
echo "" >&2
4547

46-
cleanup
48+
./additionalTests.sh -s clean
4749
}
4850

4951
#################################################
@@ -62,6 +64,7 @@ runFunctionalTests () {
6264
local TEST_PATH=${4}
6365
local PREFER_LOWEST=${5}
6466

67+
clear
6568
echo "###########################################################################" >&2
6669
echo " Run unit and/or functional tests with" >&2
6770
echo " - TYPO3 ${TYPO3_VERSION}" >&2
@@ -70,6 +73,7 @@ runFunctionalTests () {
7073
echo " - Test path ${TEST_PATH}">&2
7174
echo " - Additional ${PREFER_LOWEST}">&2
7275
echo "###########################################################################" >&2
76+
echo "" >&2
7377

7478
./runTests.sh -s cleanTests
7579

@@ -80,21 +84,12 @@ runFunctionalTests () {
8084

8185
./runTests.sh \
8286
-p ${PHP_VERSION} \
83-
-s composerInstall || exit 1 ; \
84-
EXIT_CODE_CORE=$?
85-
86-
./additionalTests.sh \
87-
-p ${PHP_VERSION} \
88-
-s composerInstallPackage \
89-
-q "typo3/cms-core:${TYPO3_VERSION}" \
90-
-r " ${PREFER_LOWEST}" || exit 1 ; \
87+
-s composer require ${PREFER_LOWEST} "typo3/cms-core:${TYPO3_VERSION}" || exit 1 ; \
9188
EXIT_CODE_CORE=$?
9289

93-
./additionalTests.sh \
90+
./runTests.sh \
9491
-p ${PHP_VERSION} \
95-
-s composerInstallPackage \
96-
-q "typo3/testing-framework:${TESTING_FRAMEWORK}" \
97-
-r " --dev ${PREFER_LOWEST}" || exit 1 ; \
92+
-s composer require --dev ${PREFER_LOWEST} "typo3/testing-framework:${TESTING_FRAMEWORK}" || exit 1 ; \
9893
EXIT_CODE_FRAMEWORK=$?
9994

10095
./runTests.sh \
@@ -140,7 +135,6 @@ runFunctionalTests () {
140135
cleanup () {
141136
./runTests.sh -s clean
142137
./additionalTests.sh -s clean
143-
echo "Cleaned up all test related files"
144138
}
145139

146140
LOWEST="--prefer-lowest"
@@ -150,17 +144,17 @@ DEBUG_TESTS=false
150144
if [[ $DEBUG_TESTS != true ]]; then
151145
checkResources
152146

153-
TCORE="^13.0"
147+
TCORE="^14.0"
154148
TFRAMEWORK="dev-main"
155-
156149
runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
157150
runFunctionalTests "8.2" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
158151
runFunctionalTests "8.3" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
159152
runFunctionalTests "8.3" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
160-
cleanup
153+
runFunctionalTests "8.4" ${TCORE} ${TFRAMEWORK} ${TPATH} || exit 1
154+
#runFunctionalTests "8.4" ${TCORE} ${TFRAMEWORK} ${TPATH} ${LOWEST} || exit 1
161155
else
162156
#cleanup
163-
runFunctionalTests "8.2" "^13.0" "dev-main" ${TPATH} ${LOWEST} || exit 1
157+
runFunctionalTests "8.4" "^14.0" "dev-main" ${TPATH} ${LOWEST} || exit 1
164158
# ./runTests.sh -x -p 8.2 -d sqlite -s functional -e "--group selected" Tests/Functional
165159
# ./runTests.sh -x -p 8.2 -d sqlite -s functional Tests/Functional
166160
fi

0 commit comments

Comments
 (0)