unittest fixes for neon and convert_from include

BUG=11
TESTED=tested on windows when run from root of libyuv
Review URL: https://webrtc-codereview.appspot.com/426004

git-svn-id: http://libyuv.googlecode.com/svn/trunk@199 16f28f9a-4ce2-e073-06de-1de4eb20be90

README.chromium

 Name: libyuv
 URL: http://code.google.com/p/libyuv/
-Version: 192
+Version: 199
 License: BSD
 License File: LICENSE
 

include/libyuv/version.h

@@ -11,7 +11,7 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 192
+#define LIBYUV_VERSION 199
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
 

unit_test/cpu_test.cc

@@ -19,11 +19,12 @@
 
 namespace libyuv {
 
+// For testing purposes call the proc/cpuinfo parser directly
 extern "C" int ArmCpuCaps(const char* cpuinfoname);
 
 TEST_F(libyuvTest, TestLinuxNeon) {
-  EXPECT_EQ(0,ArmCpuCaps("testdata/arm_v7.txt"));
-  EXPECT_NE(kCpuHasNEON,ArmCpuCaps("testdata/tegra3.txt"));
+  EXPECT_EQ(0, ArmCpuCaps("unit_test/testdata/arm_v7.txt"));
+  EXPECT_EQ(kCpuHasNEON, ArmCpuCaps("unit_test/testdata/tegra3.txt"));
 }
 
 TEST_F(libyuvTest, TestVersion) {

unit_test/planar_test.cc

@@ -13,9 +13,10 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include "libyuv/rotate.h"
-#include "libyuv/planar_functions.h"
+#include "libyuv/convert_from.h"
 #include "libyuv/cpu_id.h"
+#include "libyuv/planar_functions.h"
+#include "libyuv/rotate.h"
 
 namespace libyuv {