From 60d38cbc1d4c3d5a460ab3e718e7d9acc34c3fba Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Fri, 4 Mar 2016 13:05:04 -0800
Subject: [PATCH] Simplify Node Windows tests slightly
Simplify command that removes OpenSSL headers and remove now-extraneous
post-test script.
---
tools/run_tests/build_node.bat | 2 +-
tools/run_tests/post_test_node.bat | 30 ------------------------------
tools/run_tests/run_tests.py | 5 +----
3 files changed, 2 insertions(+), 35 deletions(-)
delete mode 100644 tools/run_tests/post_test_node.bat
diff --git a/tools/run_tests/build_node.bat b/tools/run_tests/build_node.bat
index 886af0610f..82e8208348 100644
--- a/tools/run_tests/build_node.bat
+++ b/tools/run_tests/build_node.bat
@@ -35,7 +35,7 @@ call npm install --build-from-source
@rem delete the redundant openssl headers
for /f "delims=v" %%v in ('node --version') do (
- rmdir "%HOMEDRIVE%%HOMEPATH%\.node-gyp\%%v\include\node\openssl" /S /Q
+ rmdir "%USERPROFILE%\.node-gyp\%%v\include\node\openssl" /S /Q
)
@rem rebuild, because it probably failed the first time
diff --git a/tools/run_tests/post_test_node.bat b/tools/run_tests/post_test_node.bat
deleted file mode 100644
index 1a2a5491fa..0000000000
--- a/tools/run_tests/post_test_node.bat
+++ /dev/null
@@ -1,30 +0,0 @@
-@rem Copyright 2016, Google Inc.
-@rem All rights reserved.
-@rem
-@rem Redistribution and use in source and binary forms, with or without
-@rem modification, are permitted provided that the following conditions are
-@rem met:
-@rem
-@rem * Redistributions of source code must retain the above copyright
-@rem notice, this list of conditions and the following disclaimer.
-@rem * Redistributions in binary form must reproduce the above
-@rem copyright notice, this list of conditions and the following disclaimer
-@rem in the documentation and/or other materials provided with the
-@rem distribution.
-@rem * Neither the name of Google Inc. nor the names of its
-@rem contributors may be used to endorse or promote products derived from
-@rem this software without specific prior written permission.
-@rem
-@rem THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-@rem "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-@rem LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-@rem A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-@rem OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-@rem SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-@rem LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-@rem DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-@rem THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-@rem (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-@rem OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-rmdir node_modules /S /Q
\ No newline at end of file
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index c55d1fbe63..cc004f38d7 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -290,10 +290,7 @@ class NodeLanguage(object):
return [['tools/run_tests/build_node.sh', self.node_version]]
def post_tests_steps(self):
- if self.platform == 'windows':
- return [['tools\\run_tests\\post_test_node.bat']]
- else:
- return []
+ return []
def makefile_name(self):
return 'Makefile'
--
GitLab