aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Yun Peng <pcloudy@google.com>2017-03-09 14:42:22 +0000
committerGravatar Vladimir Moskva <vladmos@google.com>2017-03-09 16:27:32 +0000
commit668388ac0af75a8208f3f40653d6170dde84623f (patch)
tree50b5571b4cc28654214de3bb53c81dce976b3e31 /src
parent8efd282a652b3b55411a0e02c227c52ae72a087e (diff)
Fix //src/test/native:windows_jni_test on Windows
-- Change-Id: I35f2ce0e8c50f4167c783d5e4b9f60417e2b0aa1 Reviewed-on: https://cr.bazel.build/9312 PiperOrigin-RevId: 149647513 MOS_MIGRATED_REVID=149647513
Diffstat (limited to 'src')
-rw-r--r--src/test/native/windows_util_test.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/test/native/windows_util_test.cc b/src/test/native/windows_util_test.cc
index 301b37343c..9e4b7cccd6 100644
--- a/src/test/native/windows_util_test.cc
+++ b/src/test/native/windows_util_test.cc
@@ -273,19 +273,18 @@ static function<wstring()> MakeConversionFunc(const char* input) {
TEST(WindowsUtilTest, TestAsExecutablePathForCreateProcessBadInputs) {
ASSERT_SHORTENING_FAILS("", "should not be empty");
ASSERT_SHORTENING_FAILS("\"cmd.exe\"", "should not be quoted");
- ASSERT_SHORTENING_FAILS("/dev/null", "Windows-style path");
- ASSERT_SHORTENING_FAILS("/usr/bin/bash", "Windows-style path");
+ ASSERT_SHORTENING_FAILS("/dev/null", "path='/dev/null' is absolute");
+ ASSERT_SHORTENING_FAILS("/usr/bin/bash", "path='/usr/bin/bash' is absolute");
ASSERT_SHORTENING_FAILS("foo\\bar.exe", "absolute");
ASSERT_SHORTENING_FAILS("foo\\..\\bar.exe", "normalized");
- ASSERT_SHORTENING_FAILS("c:/bar.exe", "Windows-style");
- ASSERT_SHORTENING_FAILS("\\bar.exe", "drive letter");
+ ASSERT_SHORTENING_FAILS("\\bar.exe", "path='\\bar.exe' is absolute");
string dummy = "hello";
while (dummy.size() < MAX_PATH) {
dummy += dummy;
}
dummy += ".exe";
- ASSERT_SHORTENING_FAILS(dummy.c_str(), "shorter than MAX_PATH");
+ ASSERT_SHORTENING_FAILS(dummy.c_str(), "a file name but too long");
}
TEST(WindowsUtilTest, TestAsExecutablePathForCreateProcessConversions) {