commit f96845c02905d09e048485523bd1636c913bf930
author Spencer Low <CompareAndSwap@gmail.com> Mon Aug 03 20:43:24 2015 -0700
committer Spencer Low <CompareAndSwap@gmail.com> Thu Aug 06 18:09:32 2015 -0700
tree 94cc98bbfa1de7d6784ddfdf9e7b84fae1bf1b30
parent a7549c6131a2f09612156bdf7a332a69ec1ebadd

win32: adb_test/libbase_test fixes

 - My recent change with -DUNICODE=1 required changing
   GetProfilesDirectory() to GetProfilesDirectoryA() for the ANSI version
   of the API.

 - enh's edit to my previous change deleted a test that used
   /proc/version, but I think another test was missed. Merge that test into
   another.

Change-Id: Ic748549848e7be922bcbf218d5b0c3fca2a90704
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>

adb_utils_test.cpp

diff --git a/adb_utils_test.cpp b/adb_utils_test.cpp
index 34b54e7..17c8d0a 100644
--- a/adb_utils_test.cpp
+++ b/adb_utils_test.cpp
@@ -48,7 +48,7 @@
   DWORD cch = arraysize(profiles_dir);
 
   // On typical Windows 7, returns C:\Users
-  ASSERT_TRUE(GetProfilesDirectory(profiles_dir, &cch));
+  ASSERT_TRUE(GetProfilesDirectoryA(profiles_dir, &cch));
 
   ASSERT_TRUE(directory_exists(profiles_dir));