mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test: fix some broken globs for spec-main (#35439)

Browse source
This commit is contained in:
Jeremy Rose 2022-08-25 09:36:08 -07:00 committed by GitHub
parent 3de7844212
commit 3eb593dfde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.circleci/config/base.yml
View file

@ -1060,7 +1060,7 @@ steps-tests: &steps-tests
export LLVM_SYMBOLIZER_PATH=$PWD/third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer export LLVM_SYMBOLIZER_PATH=$PWD/third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer
export MOCHA_TIMEOUT=180000 export MOCHA_TIMEOUT=180000
echo "Piping output to ASAN_SYMBOLIZE ($ASAN_SYMBOLIZE)" echo "Piping output to ASAN_SYMBOLIZE ($ASAN_SYMBOLIZE)"
(cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.ts | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE
else else
if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
@ -1069,7 +1069,7 @@ steps-tests: &steps-tests
if [ "$TARGET_ARCH" == "ia32" ]; then if [ "$TARGET_ARCH" == "ia32" ]; then
npm_config_arch=x64 node electron/node_modules/dugite/script/download-git.js npm_config_arch=x64 node electron/node_modules/dugite/script/download-git.js
fi fi
(cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split --split-by=timings)) (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.ts | circleci tests split --split-by=timings))
fi fi
fi fi
- run: - run:

6
.gitignore vendored
View file

@ -35,13 +35,13 @@ electron-api.json
electron.d.ts electron.d.ts
# Spec hash calculation # Spec hash calculation
spec-main/.hash spec/.hash
# Eslint Cache # Eslint Cache
.eslintcache* .eslintcache*
# Generated native addon files # Generated native addon files
/spec-main/fixtures/native-addon/echo/build/ /spec/fixtures/native-addon/echo/build/
# If someone runs tsc this is where stuff will end up # If someone runs tsc this is where stuff will end up
ts-gen ts-gen
@ -53,4 +53,4 @@ ts-gen
# Used to accelerate builds after sync # Used to accelerate builds after sync
patches/mtime-cache.json patches/mtime-cache.json
spec-main/fixtures/logo.png spec/fixtures/logo.png