From: huiyu.eun Date: Wed, 10 Aug 2016 14:11:25 +0000 (+0900) Subject: Merge branch 'upstream' into tizen X-Git-Tag: submit/tizen/20160811.010655^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5567d77d3aeaa4a0a6402639a619391deee18e5;p=platform%2Fupstream%2FSDL.git Merge branch 'upstream' into tizen Conflicts: BUGS.txt CMakeLists.txt COPYING.txt CREDITS.txt INSTALL.txt README-SDL.txt README.txt TODO.txt VisualC-WinRT/SDL2-WinRT.nuspec VisualC-WinRT/SDL2-WinRT.targets VisualC-WinRT/SDL2main-WinRT-NonXAML.nuspec VisualC-WinRT/SDL2main-WinRT-NonXAML.targets VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj VisualC-WinRT/UWP_VS2015/SDL-UWP.vcxproj.filters VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj VisualC-WinRT/WinPhone80_VS2012/SDL-WinPhone80.vcxproj.filters VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj VisualC-WinRT/WinPhone81_VS2013/SDL-WinPhone81.vcxproj.filters VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.sln VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj VisualC-WinRT/WinRT80_VS2012/SDL-WinRT80.vcxproj.filters VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj VisualC-WinRT/WinRT81_VS2013/SDL-WinRT81.vcxproj.filters VisualC-WinRT/tests/loopwave/Package.appxmanifest VisualC-WinRT/tests/loopwave/loopwave_VS2012.vcxproj VisualC-WinRT/tests/testthread/Package.appxmanifest VisualC-WinRT/tests/testthread/testthread_VS2012.vcxproj VisualC/SDL.sln VisualC/SDL/SDL.vcxproj.filters VisualC/SDL/SDL_VS2008.vcproj VisualC/SDL_VS2008.sln VisualC/SDLmain/SDLmain_VS2008.vcproj VisualC/SDLtest/SDLtest.vcxproj VisualC/SDLtest/SDLtest_VS2008.vcproj VisualC/tests/checkkeys/checkkeys.vcxproj VisualC/tests/checkkeys/checkkeys_VS2008.vcproj VisualC/tests/controllermap/controllermap.vcxproj VisualC/tests/controllermap/controllermap_VS2008.vcproj VisualC/tests/loopwave/loopwave.vcxproj VisualC/tests/loopwave/loopwave_VS2008.vcproj VisualC/tests/testatomic/testatomic.vcxproj VisualC/tests/testatomic/testatomic_VS2008.vcproj VisualC/tests/testautomation/testautomation.vcxproj VisualC/tests/testautomation/testautomation_VS2008.vcproj VisualC/tests/testdraw2/testdraw2.vcxproj VisualC/tests/testdraw2/testdraw2_VS2008.vcproj VisualC/tests/testfile/testfile.vcxproj VisualC/tests/testfile/testfile_VS2008.vcproj VisualC/tests/testgamecontroller/testgamecontroller.vcxproj VisualC/tests/testgamecontroller/testgamecontroller_VS2008.vcproj VisualC/tests/testgesture/testgesture.vcxproj VisualC/tests/testgesture/testgesture_VS2008.vcproj VisualC/tests/testgl2/testgl2.vcxproj VisualC/tests/testgl2/testgl2_VS2008.vcproj VisualC/tests/testgles2/testgles2.vcxproj VisualC/tests/testgles2/testgles2_VS2008.vcproj VisualC/tests/testjoystick/testjoystick.vcxproj VisualC/tests/testjoystick/testjoystick_VS2008.vcproj VisualC/tests/testoverlay2/testoverlay2.vcxproj VisualC/tests/testoverlay2/testoverlay2_VS2008.vcproj VisualC/tests/testplatform/testplatform.vcxproj VisualC/tests/testplatform/testplatform_VS2008.vcproj VisualC/tests/testpower/testpower.vcxproj VisualC/tests/testpower/testpower_VS2008.vcproj VisualC/tests/testrendertarget/testrendertarget.vcxproj VisualC/tests/testrendertarget/testrendertarget_VS2008.vcproj VisualC/tests/testrumble/testrumble.vcxproj VisualC/tests/testrumble/testrumble_VS2008.vcproj VisualC/tests/testscale/testscale.vcxproj VisualC/tests/testscale/testscale_VS2008.vcproj VisualC/tests/testshape/testshape.vcxproj VisualC/tests/testshape/testshape_VS2008.vcproj VisualC/tests/testsprite2/testsprite2.vcxproj VisualC/tests/testsprite2/testsprite2_VS2008.vcproj VisualC/visualtest/unittest/testquit/testquit_VS2012.vcxproj VisualC/visualtest/visualtest_VS2012.vcxproj WhatsNew.txt build-scripts/windows-buildbot-zipper.bat build-scripts/winrtbuild.bat build-scripts/winrtbuild.ps1 cmake/sdlchecks.cmake configure configure.in docs/README-android.md docs/README-cmake.md docs/README-directfb.md docs/README-gesture.md docs/README-hg.md docs/README-ios.md docs/README-macosx.md docs/README-pandora.md docs/README-porting.md docs/README-psp.md docs/README-raspberrypi.md docs/README-touch.md docs/README-wince.md include/SDL_config.h.cmake include/SDL_config.h.in include/SDL_config_pandora.h include/SDL_events.h include/SDL_main.h include/SDL_platform.h include/SDL_syswm.h include/SDL_test_harness.h include/SDL_video.h src/SDL.c src/SDL_log.c src/dynapi/SDL_dynapi_overrides.h src/dynapi/SDL_dynapi_procs.h src/events/SDL_events.c src/main/windows/version.rc src/stdlib/SDL_stdlib.c src/test/SDL_test_harness.c src/test/SDL_test_log.c src/video/SDL_sysvideo.h src/video/SDL_video.c src/video/wayland/SDL_waylanddyn.c src/video/wayland/SDL_waylanddyn.h src/video/wayland/SDL_waylandevents.c src/video/wayland/SDL_waylandsym.h src/video/wayland/SDL_waylandvideo.c src/video/wayland/SDL_waylandvideo.h src/video/wayland/SDL_waylandwindow.c src/video/wayland/SDL_waylandwindow.h src/video/x11/SDL_x11video.c test/configure test/loopwave.c test/loopwavequeue.c test/testatomic.c test/testaudiohotplug.c test/testaudioinfo.c test/testautomation.c test/testautomation_audio.c test/testautomation_clipboard.c test/testautomation_events.c test/testautomation_hints.c test/testautomation_keyboard.c test/testautomation_main.c test/testautomation_mouse.c test/testautomation_pixels.c test/testautomation_platform.c test/testautomation_rect.c test/testautomation_render.c test/testautomation_rwops.c test/testautomation_sdltest.c test/testautomation_stdlib.c test/testautomation_suites.h test/testautomation_surface.c test/testautomation_syswm.c test/testautomation_timer.c test/testautomation_video.c test/testdisplayinfo.c test/testdraw2.c test/testdrawchessboard.c test/testdropfile.c test/testerror.c test/testfile.c test/testfilesystem.c test/testgles.c test/testgles2.c test/testhittesting.c test/testiconv.c test/testime.c test/testintersections.c test/testkeys.c test/testloadso.c test/testlock.c test/testmessage.c test/testmultiaudio.c test/testoverlay2.c test/testplatform.c test/testrelative.c test/testrendercopyex.c test/testrendertarget.c test/testresample.c test/testscale.c test/testsem.c test/testshader.c test/testshape.c test/testsprite2.c test/testspriteminimal.c test/teststreaming.c test/testthread.c test/testtimer.c test/testver.c test/testviewport.c test/torturethread.c --- c5567d77d3aeaa4a0a6402639a619391deee18e5 diff --cc test/testautomation_audio.c index 47e9238,bef838d..c26ec45 mode 100755,100644..100755 --- a/test/testautomation_audio.c +++ b/test/testautomation_audio.c @@@ -708,12 -708,6 +708,12 @@@ int audio_openCloseAndGetAudioStatus( for (i = 0; i < count; i++) { /* Get device name */ device = (char *)SDL_GetAudioDeviceName(i, 0); + /*add by majunqing for skip the device 1*/ + const char* ignoreDevice = "VIRTUAL AUDIO W"; + if(SDL_strcmp(device, ignoreDevice) == 0) - { ++ { + continue; + } SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i); SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL"); if (device == NULL) return TEST_ABORTED; @@@ -772,14 -766,6 +772,14 @@@ int audio_lockUnlockOpenAudioDevice( for (i = 0; i < count; i++) { /* Get device name */ device = (char *)SDL_GetAudioDeviceName(i, 0); + + /*add by majunqing for skip the device 1*/ + const char* ignoreDevice = "VIRTUAL AUDIO W"; + if(SDL_strcmp(device, ignoreDevice) == 0) - { ++ { + continue; + } + SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i); SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL"); if (device == NULL) return TEST_ABORTED; @@@ -942,13 -928,6 +942,13 @@@ int audio_openCloseAudioDeviceConnected for (i = 0; i < count; i++) { /* Get device name */ device = (char *)SDL_GetAudioDeviceName(i, 0); + /*add by majunqing for skip the device 1*/ + const char* ignoreDevice = "VIRTUAL AUDIO W"; + if(SDL_strcmp(device, ignoreDevice) == 0) - { ++ { + continue; + } + SDLTest_AssertPass("SDL_GetAudioDeviceName(%i,0)", i); SDLTest_AssertCheck(device != NULL, "Validate device name is not NULL; got: %s", (device != NULL) ? device : "NULL"); if (device == NULL) return TEST_ABORTED;