]> granicus.if.org Git - libvpx/commitdiff
fix make test invocation for msvc win64
authorJames Zern <jzern@google.com>
Fri, 5 Apr 2013 18:56:54 +0000 (11:56 -0700)
committerJames Zern <jzern@google.com>
Fri, 5 Apr 2013 18:56:54 +0000 (11:56 -0700)
Change-Id: If5d4b7ffa67223ed72b53a6c9b9e42b4de5718f2

build/make/configure.sh
libs.mk

index 1ac3035253a114e7e7cafb3acc52905109b8a92d..050ae57a7db7522a7b6fb0794116e867e22fe88c 100755 (executable)
@@ -1087,10 +1087,12 @@ EOF
             win32)
                 add_asflags -f win32
                 enabled debug && add_asflags -g cv8
+                EXE_SFX=.exe
             ;;
             win64)
                 add_asflags -f x64
                 enabled debug && add_asflags -g cv8
+                EXE_SFX=.exe
             ;;
             linux*|solaris*|android*)
                 add_asflags -f elf${bits}
diff --git a/libs.mk b/libs.mk
index 872a16bae0bd22c87dddb3ce22817b974a9ca3bc..2281bd059a3e175a31823034caeb21a020f0c177 100644 (file)
--- a/libs.mk
+++ b/libs.mk
@@ -436,7 +436,7 @@ test_libvpx.vcproj: $(LIBVPX_TEST_SRCS)
 PROJECTS-$(CONFIG_MSVS) += test_libvpx.vcproj
 
 test:: testdata
-       @set -e; for t in $(addprefix Win32/Release/,$(notdir $(LIBVPX_TEST_BINS:.cc=.exe))); do $$t; done
+       @set -e; for t in $(addprefix $(TGT_OS:win64=x64)/Release/,$(notdir $(LIBVPX_TEST_BINS:.cc=.exe))); do $$t; done
 endif
 else