Skip to content

Commit be6bfb4

Browse files
authored
fix(cloud-profiler): re-enable tests (googleapis#8828)
* fix(cloud-profiler): re-enable tests Restores the `test` and `system-test` scripts that were previously disabled in googleapis/cloud-profiler-nodejs#1002. * fix(cloud-profiler): keep system-test disabled
1 parent d185186 commit be6bfb4

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

ci/run_conditional_tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ tests_with_credentials="core/packages/google-auth-library-nodejs/ packages/googl
9292
# on Windows due to incompatible npm scripts.
9393
#
9494
# Until these packages can be updated to be OS agnostic, we will skip them on Windows.
95-
windows_exempt_tests="core/ core/packages/ core/dev-packages/ .github/scripts/fixtures/ .github/scripts/tests/ core/packages/gapic-node-processing/ core/packages/typeless-sample-bot/"
95+
windows_exempt_tests="core/ core/packages/ core/dev-packages/ .github/scripts/fixtures/ .github/scripts/tests/ core/packages/gapic-node-processing/ core/packages/typeless-sample-bot/ handwritten/cloud-profiler/"
9696

9797
for subdir in ${subdirs[@]}; do
9898
for d in `ls -d ${subdir}/*/`; do
@@ -133,8 +133,8 @@ for subdir in ${subdirs[@]}; do
133133
continue
134134
fi
135135

136-
# Our CI uses Git Bash on Windows to execute this script, which returns "msys" for OSTYPE.
137-
if [[ "$OSTYPE" == "msys" ]]; then
136+
# Our CI uses Git Bash on Windows to execute this script, which returns "msys" or "cygwin" for OSTYPE.
137+
if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" || "$OS" == "Windows_NT" ]]; then
138138
if [[ "${windows_exempt_tests}" =~ "${d}" ]]; then
139139
echo "Skipping ${d} on Windows (in exemption list)"
140140
continue

handwritten/cloud-profiler/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"main": "build/src/index.js",
1111
"types": "build/src/index.d.ts",
1212
"scripts": {
13-
"test": "echo 'skipping tests for time being'",
13+
"test": "c8 mocha 'build/test/test-*.js'",
1414
"system-test": "echo 'skipping tests for time being'",
1515
"samples-test": "echo 'no sample tests'",
1616
"clean": "gts clean",
@@ -20,7 +20,7 @@
2020
"docs": "jsdoc -c .jsdoc.js",
2121
"prelint": "cd samples; npm link ../; npm install",
2222
"prepare": "npm run compile",
23-
"pretest": "npm run compile",
23+
"pretest": "npm run compile && node-gyp rebuild --directory node_modules/pprof",
2424
"license-check": "jsgl --local .",
2525
"precompile": "gts clean"
2626
},

0 commit comments

Comments
 (0)