Move trunk/test/data -> trunk/data

BUG= TEST=all trybot test failures passed locally Review URL: https://webrtc-codereview.appspot.com/583007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2280 4adac7df-926f-26a2-2b94-8c16560cd09d
GetStream · May 23, 2012 · 9dc45da · 9dc45da
1 parent 1484ac0
commit 9dc45da
Show file tree

Hide file tree

Showing 116 changed files with 39 additions and 39 deletions.
diff --git a/test/data/audio_coding/F00.BIT20 → data/audio_coding/F00.BIT20 b/test/data/audio_coding/F00.BIT20 → data/audio_coding/F00.BIT20
diff --git a/test/data/audio_coding/F00.BIT30 → data/audio_coding/F00.BIT30 b/test/data/audio_coding/F00.BIT30 → data/audio_coding/F00.BIT30
diff --git a/test/data/audio_coding/F00.INP → data/audio_coding/F00.INP b/test/data/audio_coding/F00.INP → data/audio_coding/F00.INP
diff --git a/test/data/audio_coding/F00.OUT20 → data/audio_coding/F00.OUT20 b/test/data/audio_coding/F00.OUT20 → data/audio_coding/F00.OUT20
diff --git a/test/data/audio_coding/F00.OUT30 → data/audio_coding/F00.OUT30 b/test/data/audio_coding/F00.OUT30 → data/audio_coding/F00.OUT30
diff --git a/test/data/audio_coding/F00_tlm10.OUT20 → data/audio_coding/F00_tlm10.OUT20 b/test/data/audio_coding/F00_tlm10.OUT20 → data/audio_coding/F00_tlm10.OUT20
diff --git a/test/data/audio_coding/F00_tlm10.OUT30 → data/audio_coding/F00_tlm10.OUT30 b/test/data/audio_coding/F00_tlm10.OUT30 → data/audio_coding/F00_tlm10.OUT30
diff --git a/test/data/audio_coding/F01.BIT20 → data/audio_coding/F01.BIT20 b/test/data/audio_coding/F01.BIT20 → data/audio_coding/F01.BIT20
diff --git a/test/data/audio_coding/F01.BIT30 → data/audio_coding/F01.BIT30 b/test/data/audio_coding/F01.BIT30 → data/audio_coding/F01.BIT30
diff --git a/test/data/audio_coding/F01.INP → data/audio_coding/F01.INP b/test/data/audio_coding/F01.INP → data/audio_coding/F01.INP
diff --git a/test/data/audio_coding/F01.OUT20 → data/audio_coding/F01.OUT20 b/test/data/audio_coding/F01.OUT20 → data/audio_coding/F01.OUT20
diff --git a/test/data/audio_coding/F01.OUT30 → data/audio_coding/F01.OUT30 b/test/data/audio_coding/F01.OUT30 → data/audio_coding/F01.OUT30
diff --git a/test/data/audio_coding/F01_tlm10.OUT20 → data/audio_coding/F01_tlm10.OUT20 b/test/data/audio_coding/F01_tlm10.OUT20 → data/audio_coding/F01_tlm10.OUT20
diff --git a/test/data/audio_coding/F01_tlm10.OUT30 → data/audio_coding/F01_tlm10.OUT30 b/test/data/audio_coding/F01_tlm10.OUT30 → data/audio_coding/F01_tlm10.OUT30
diff --git a/test/data/audio_coding/F02.BIT20 → data/audio_coding/F02.BIT20 b/test/data/audio_coding/F02.BIT20 → data/audio_coding/F02.BIT20
diff --git a/test/data/audio_coding/F02.BIT30 → data/audio_coding/F02.BIT30 b/test/data/audio_coding/F02.BIT30 → data/audio_coding/F02.BIT30
diff --git a/test/data/audio_coding/F02.INP → data/audio_coding/F02.INP b/test/data/audio_coding/F02.INP → data/audio_coding/F02.INP
diff --git a/test/data/audio_coding/F02.OUT20 → data/audio_coding/F02.OUT20 b/test/data/audio_coding/F02.OUT20 → data/audio_coding/F02.OUT20
diff --git a/test/data/audio_coding/F02.OUT30 → data/audio_coding/F02.OUT30 b/test/data/audio_coding/F02.OUT30 → data/audio_coding/F02.OUT30
diff --git a/test/data/audio_coding/F02_tlm10.OUT20 → data/audio_coding/F02_tlm10.OUT20 b/test/data/audio_coding/F02_tlm10.OUT20 → data/audio_coding/F02_tlm10.OUT20
diff --git a/test/data/audio_coding/F02_tlm10.OUT30 → data/audio_coding/F02_tlm10.OUT30 b/test/data/audio_coding/F02_tlm10.OUT30 → data/audio_coding/F02_tlm10.OUT30
diff --git a/test/data/audio_coding/F03.BIT20 → data/audio_coding/F03.BIT20 b/test/data/audio_coding/F03.BIT20 → data/audio_coding/F03.BIT20
diff --git a/test/data/audio_coding/F03.BIT30 → data/audio_coding/F03.BIT30 b/test/data/audio_coding/F03.BIT30 → data/audio_coding/F03.BIT30
diff --git a/test/data/audio_coding/F03.INP → data/audio_coding/F03.INP b/test/data/audio_coding/F03.INP → data/audio_coding/F03.INP
diff --git a/test/data/audio_coding/F03.OUT20 → data/audio_coding/F03.OUT20 b/test/data/audio_coding/F03.OUT20 → data/audio_coding/F03.OUT20
diff --git a/test/data/audio_coding/F03.OUT30 → data/audio_coding/F03.OUT30 b/test/data/audio_coding/F03.OUT30 → data/audio_coding/F03.OUT30
diff --git a/test/data/audio_coding/F04.BIT20 → data/audio_coding/F04.BIT20 b/test/data/audio_coding/F04.BIT20 → data/audio_coding/F04.BIT20
diff --git a/test/data/audio_coding/F04.BIT30 → data/audio_coding/F04.BIT30 b/test/data/audio_coding/F04.BIT30 → data/audio_coding/F04.BIT30
diff --git a/test/data/audio_coding/F04.INP → data/audio_coding/F04.INP b/test/data/audio_coding/F04.INP → data/audio_coding/F04.INP
diff --git a/test/data/audio_coding/F04.OUT20 → data/audio_coding/F04.OUT20 b/test/data/audio_coding/F04.OUT20 → data/audio_coding/F04.OUT20
diff --git a/test/data/audio_coding/F04.OUT30 → data/audio_coding/F04.OUT30 b/test/data/audio_coding/F04.OUT30 → data/audio_coding/F04.OUT30
diff --git a/test/data/audio_coding/F05.BIT20 → data/audio_coding/F05.BIT20 b/test/data/audio_coding/F05.BIT20 → data/audio_coding/F05.BIT20
diff --git a/test/data/audio_coding/F05.BIT30 → data/audio_coding/F05.BIT30 b/test/data/audio_coding/F05.BIT30 → data/audio_coding/F05.BIT30
diff --git a/test/data/audio_coding/F05.INP → data/audio_coding/F05.INP b/test/data/audio_coding/F05.INP → data/audio_coding/F05.INP
diff --git a/test/data/audio_coding/F05.OUT20 → data/audio_coding/F05.OUT20 b/test/data/audio_coding/F05.OUT20 → data/audio_coding/F05.OUT20
diff --git a/test/data/audio_coding/F05.OUT30 → data/audio_coding/F05.OUT30 b/test/data/audio_coding/F05.OUT30 → data/audio_coding/F05.OUT30
diff --git a/test/data/audio_coding/F06.BIT20 → data/audio_coding/F06.BIT20 b/test/data/audio_coding/F06.BIT20 → data/audio_coding/F06.BIT20
diff --git a/test/data/audio_coding/F06.BIT30 → data/audio_coding/F06.BIT30 b/test/data/audio_coding/F06.BIT30 → data/audio_coding/F06.BIT30
diff --git a/test/data/audio_coding/F06.INP → data/audio_coding/F06.INP b/test/data/audio_coding/F06.INP → data/audio_coding/F06.INP
diff --git a/test/data/audio_coding/F06.OUT20 → data/audio_coding/F06.OUT20 b/test/data/audio_coding/F06.OUT20 → data/audio_coding/F06.OUT20
diff --git a/test/data/audio_coding/F06.OUT30 → data/audio_coding/F06.OUT30 b/test/data/audio_coding/F06.OUT30 → data/audio_coding/F06.OUT30
diff --git a/test/data/audio_coding/READ.ME → data/audio_coding/READ.ME b/test/data/audio_coding/READ.ME → data/audio_coding/READ.ME
diff --git a/test/data/audio_coding/clean.chn → data/audio_coding/clean.chn b/test/data/audio_coding/clean.chn → data/audio_coding/clean.chn
diff --git a/test/data/audio_coding/testfile32kHz.pcm → data/audio_coding/testfile32kHz.pcm b/test/data/audio_coding/testfile32kHz.pcm → data/audio_coding/testfile32kHz.pcm
diff --git a/test/data/audio_coding/teststereo32kHz.pcm → data/audio_coding/teststereo32kHz.pcm b/test/data/audio_coding/teststereo32kHz.pcm → data/audio_coding/teststereo32kHz.pcm
diff --git a/test/data/audio_coding/tlm10.chn → data/audio_coding/tlm10.chn b/test/data/audio_coding/tlm10.chn → data/audio_coding/tlm10.chn
diff --git a/test/data/audio_coding/universal.rtp → data/audio_coding/universal.rtp b/test/data/audio_coding/universal.rtp → data/audio_coding/universal.rtp
diff --git a/test/data/audio_coding/universal_ref.pcm → data/audio_coding/universal_ref.pcm b/test/data/audio_coding/universal_ref.pcm → data/audio_coding/universal_ref.pcm
diff --git a/test/data/audio_device/audio_short16.pcm → data/audio_device/audio_short16.pcm b/test/data/audio_device/audio_short16.pcm → data/audio_device/audio_short16.pcm
diff --git a/test/data/audio_device/audio_short44.pcm → data/audio_device/audio_short44.pcm b/test/data/audio_device/audio_short44.pcm → data/audio_device/audio_short44.pcm
diff --git a/test/data/audio_device/audio_short48.pcm → data/audio_device/audio_short48.pcm b/test/data/audio_device/audio_short48.pcm → data/audio_device/audio_short48.pcm
diff --git a/test/data/audio_device/audio_short8.pcm → data/audio_device/audio_short8.pcm b/test/data/audio_device/audio_short8.pcm → data/audio_device/audio_short8.pcm
diff --git a/...o_processing/android/output_data_fixed.pb → ...o_processing/android/output_data_fixed.pb b/...o_processing/android/output_data_fixed.pb → ...o_processing/android/output_data_fixed.pb
diff --git a/...o_processing/android/output_data_float.pb → ...o_processing/android/output_data_float.pb b/...o_processing/android/output_data_float.pb → ...o_processing/android/output_data_float.pb
diff --git a/...ata/audio_processing/output_data_fixed.pb → data/audio_processing/output_data_fixed.pb b/...ata/audio_processing/output_data_fixed.pb → data/audio_processing/output_data_fixed.pb
diff --git a/...ata/audio_processing/output_data_float.pb → data/audio_processing/output_data_float.pb b/...ata/audio_processing/output_data_float.pb → data/audio_processing/output_data_float.pb
diff --git a/test/data/common_video/jpeg/webrtc_logo.jpg → data/common_video/jpeg/webrtc_logo.jpg b/test/data/common_video/jpeg/webrtc_logo.jpg → data/common_video/jpeg/webrtc_logo.jpg
diff --git a/.../data/rtp_rtcp/H263Foreman_CIF_Iframe.bin → data/rtp_rtcp/H263Foreman_CIF_Iframe.bin b/.../data/rtp_rtcp/H263Foreman_CIF_Iframe.bin → data/rtp_rtcp/H263Foreman_CIF_Iframe.bin
diff --git a/.../data/rtp_rtcp/H263Foreman_CIF_Pframe.bin → data/rtp_rtcp/H263Foreman_CIF_Pframe.bin b/.../data/rtp_rtcp/H263Foreman_CIF_Pframe.bin → data/rtp_rtcp/H263Foreman_CIF_Pframe.bin
diff --git a/test/data/rtp_rtcp/H263_CIF_IFRAME.bin → data/rtp_rtcp/H263_CIF_IFRAME.bin b/test/data/rtp_rtcp/H263_CIF_IFRAME.bin → data/rtp_rtcp/H263_CIF_IFRAME.bin
diff --git a/test/data/rtp_rtcp/H263_CIF_PFRAME.bin → data/rtp_rtcp/H263_CIF_PFRAME.bin b/test/data/rtp_rtcp/H263_CIF_PFRAME.bin → data/rtp_rtcp/H263_CIF_PFRAME.bin
diff --git a/test/data/rtp_rtcp/H263_QCIF_IFRAME.bin → data/rtp_rtcp/H263_QCIF_IFRAME.bin b/test/data/rtp_rtcp/H263_QCIF_IFRAME.bin → data/rtp_rtcp/H263_QCIF_IFRAME.bin
diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR0.bin → data/rtp_rtcp/RTCPPacketTMMBR0.bin b/test/data/rtp_rtcp/RTCPPacketTMMBR0.bin → data/rtp_rtcp/RTCPPacketTMMBR0.bin
diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR1.bin → data/rtp_rtcp/RTCPPacketTMMBR1.bin b/test/data/rtp_rtcp/RTCPPacketTMMBR1.bin → data/rtp_rtcp/RTCPPacketTMMBR1.bin
diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR2.bin → data/rtp_rtcp/RTCPPacketTMMBR2.bin b/test/data/rtp_rtcp/RTCPPacketTMMBR2.bin → data/rtp_rtcp/RTCPPacketTMMBR2.bin
diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR3.bin → data/rtp_rtcp/RTCPPacketTMMBR3.bin b/test/data/rtp_rtcp/RTCPPacketTMMBR3.bin → data/rtp_rtcp/RTCPPacketTMMBR3.bin
diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR4.bin → data/rtp_rtcp/RTCPPacketTMMBR4.bin b/test/data/rtp_rtcp/RTCPPacketTMMBR4.bin → data/rtp_rtcp/RTCPPacketTMMBR4.bin
diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR4_1.bin → data/rtp_rtcp/RTCPPacketTMMBR4_1.bin b/test/data/rtp_rtcp/RTCPPacketTMMBR4_1.bin → data/rtp_rtcp/RTCPPacketTMMBR4_1.bin
diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR4_2.bin → data/rtp_rtcp/RTCPPacketTMMBR4_2.bin b/test/data/rtp_rtcp/RTCPPacketTMMBR4_2.bin → data/rtp_rtcp/RTCPPacketTMMBR4_2.bin
diff --git a/test/data/rtp_rtcp/RTCPPacketTMMBR5.bin → data/rtp_rtcp/RTCPPacketTMMBR5.bin b/test/data/rtp_rtcp/RTCPPacketTMMBR5.bin → data/rtp_rtcp/RTCPPacketTMMBR5.bin
diff --git a/test/data/voice_engine/audio_long16.pcm → data/voice_engine/audio_long16.pcm b/test/data/voice_engine/audio_long16.pcm → data/voice_engine/audio_long16.pcm
diff --git a/test/data/voice_engine/audio_long16.wav → data/voice_engine/audio_long16.wav b/test/data/voice_engine/audio_long16.wav → data/voice_engine/audio_long16.wav
diff --git a/...a/voice_engine/audio_long16big_endian.pcm → data/voice_engine/audio_long16big_endian.pcm b/...a/voice_engine/audio_long16big_endian.pcm → data/voice_engine/audio_long16big_endian.pcm
diff --git a/test/data/voice_engine/audio_long16noise.pcm → data/voice_engine/audio_long16noise.pcm b/test/data/voice_engine/audio_long16noise.pcm → data/voice_engine/audio_long16noise.pcm
diff --git a/test/data/voice_engine/audio_long8.pcm → data/voice_engine/audio_long8.pcm b/test/data/voice_engine/audio_long8.pcm → data/voice_engine/audio_long8.pcm
diff --git a/test/data/voice_engine/audio_long8mulaw.wav → data/voice_engine/audio_long8mulaw.wav b/test/data/voice_engine/audio_long8mulaw.wav → data/voice_engine/audio_long8mulaw.wav
diff --git a/test/data/voice_engine/audio_short16.pcm → data/voice_engine/audio_short16.pcm b/test/data/voice_engine/audio_short16.pcm → data/voice_engine/audio_short16.pcm
diff --git a/test/data/voice_engine/audio_tiny11.wav → data/voice_engine/audio_tiny11.wav b/test/data/voice_engine/audio_tiny11.wav → data/voice_engine/audio_tiny11.wav
diff --git a/test/data/voice_engine/audio_tiny16.wav → data/voice_engine/audio_tiny16.wav b/test/data/voice_engine/audio_tiny16.wav → data/voice_engine/audio_tiny16.wav
diff --git a/test/data/voice_engine/audio_tiny22.wav → data/voice_engine/audio_tiny22.wav b/test/data/voice_engine/audio_tiny22.wav → data/voice_engine/audio_tiny22.wav
diff --git a/test/data/voice_engine/audio_tiny32.wav → data/voice_engine/audio_tiny32.wav b/test/data/voice_engine/audio_tiny32.wav → data/voice_engine/audio_tiny32.wav
diff --git a/test/data/voice_engine/audio_tiny44.wav → data/voice_engine/audio_tiny44.wav b/test/data/voice_engine/audio_tiny44.wav → data/voice_engine/audio_tiny44.wav
diff --git a/test/data/voice_engine/audio_tiny48.wav → data/voice_engine/audio_tiny48.wav b/test/data/voice_engine/audio_tiny48.wav → data/voice_engine/audio_tiny48.wav
diff --git a/test/data/voice_engine/audio_tiny8.wav → data/voice_engine/audio_tiny8.wav b/test/data/voice_engine/audio_tiny8.wav → data/voice_engine/audio_tiny8.wav
diff --git a/..._engine/stereo_rtp_files/HRTF_pcm16wb.rtp → ..._engine/stereo_rtp_files/HRTF_pcm16wb.rtp b/..._engine/stereo_rtp_files/HRTF_pcm16wb.rtp → ..._engine/stereo_rtp_files/HRTF_pcm16wb.rtp
diff --git a/.../stereo_rtp_files/HRTF_pcm16wb_jitter.rtp → .../stereo_rtp_files/HRTF_pcm16wb_jitter.rtp b/.../stereo_rtp_files/HRTF_pcm16wb_jitter.rtp → .../stereo_rtp_files/HRTF_pcm16wb_jitter.rtp
diff --git a/.../voice_engine/stereo_rtp_files/README.txt → .../voice_engine/stereo_rtp_files/README.txt b/.../voice_engine/stereo_rtp_files/README.txt → .../voice_engine/stereo_rtp_files/README.txt
diff --git a/...gine/stereo_rtp_files/hrtf_g722_1C_48.rtp → ...gine/stereo_rtp_files/hrtf_g722_1C_48.rtp b/...gine/stereo_rtp_files/hrtf_g722_1C_48.rtp → ...gine/stereo_rtp_files/hrtf_g722_1C_48.rtp
diff --git a/...eo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp → ...eo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp b/...eo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp → ...eo_rtp_files/hrtf_g722_1C_48_jitterT2.rtp
diff --git a/...voice_engine/stereo_rtp_files/rtpplay.exe → ...voice_engine/stereo_rtp_files/rtpplay.exe b/...voice_engine/stereo_rtp_files/rtpplay.exe → ...voice_engine/stereo_rtp_files/rtpplay.exe
diff --git a/...e_engine/stereo_rtp_files/stereo_g729.rtp → ...e_engine/stereo_rtp_files/stereo_g729.rtp b/...e_engine/stereo_rtp_files/stereo_g729.rtp → ...e_engine/stereo_rtp_files/stereo_g729.rtp
diff --git a/...e/stereo_rtp_files/stereo_g729_jitter.rtp → ...e/stereo_rtp_files/stereo_g729_jitter.rtp b/...e/stereo_rtp_files/stereo_g729_jitter.rtp → ...e/stereo_rtp_files/stereo_g729_jitter.rtp
diff --git a/...ngine/stereo_rtp_files/stereo_pcm16wb.rtp → ...ngine/stereo_rtp_files/stereo_pcm16wb.rtp b/...ngine/stereo_rtp_files/stereo_pcm16wb.rtp → ...ngine/stereo_rtp_files/stereo_pcm16wb.rtp
diff --git a/...tereo_rtp_files/stereo_pcm16wb_jitter.rtp → ...tereo_rtp_files/stereo_pcm16wb_jitter.rtp b/...tereo_rtp_files/stereo_pcm16wb_jitter.rtp → ...tereo_rtp_files/stereo_pcm16wb_jitter.rtp
diff --git a/...e_engine/stereo_rtp_files/stereo_pcmu.rtp → ...e_engine/stereo_rtp_files/stereo_pcmu.rtp b/...e_engine/stereo_rtp_files/stereo_pcmu.rtp → ...e_engine/stereo_rtp_files/stereo_pcmu.rtp
diff --git a/...e/stereo_rtp_files/stereo_pcmu_jitter.rtp → ...e/stereo_rtp_files/stereo_pcmu_jitter.rtp b/...e/stereo_rtp_files/stereo_pcmu_jitter.rtp → ...e/stereo_rtp_files/stereo_pcmu_jitter.rtp
diff --git a/...gine/stereo_rtp_files/stereo_pcmu_vad.rtp → ...gine/stereo_rtp_files/stereo_pcmu_vad.rtp b/...gine/stereo_rtp_files/stereo_pcmu_vad.rtp → ...gine/stereo_rtp_files/stereo_pcmu_vad.rtp
diff --git a/...ereo_rtp_files/stereo_pcmu_vad_jitter.rtp → ...ereo_rtp_files/stereo_pcmu_vad_jitter.rtp b/...ereo_rtp_files/stereo_pcmu_vad_jitter.rtp → ...ereo_rtp_files/stereo_pcmu_vad_jitter.rtp
diff --git a/...files/toggling_stereo_g729_pt18_pt125.rtp → ...files/toggling_stereo_g729_pt18_pt125.rtp b/...files/toggling_stereo_g729_pt18_pt125.rtp → ...files/toggling_stereo_g729_pt18_pt125.rtp
diff --git a/src/common_video/jpeg/jpeg_unittest.cc b/src/common_video/jpeg/jpeg_unittest.cc
@@ -25,7 +25,7 @@ class JpegTest: public testing::Test {
  protected:
   JpegTest()
       : input_filename_(webrtc::test::ProjectRootPath() +
-                       "test/data/common_video/jpeg/webrtc_logo.jpg"),
+                       "data/common_video/jpeg/webrtc_logo.jpg"),
         decoded_filename_(webrtc::test::OutputPath() + "TestJpegDec.yuv"),
         encoded_filename_(webrtc::test::OutputPath() + "TestJpegEnc.jpg"),
         encoded_buffer_(NULL) {}

diff --git a/src/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt b/src/modules/audio_coding/codecs/ilbc/test/iLBCtestscript.txt
@@ -5,7 +5,7 @@
 # This script can be used to verify the bit exactness of iLBC fixed-point version 1.0.6
 #
 
-INP=../../../../../../../test/data/audio_coding
+INP=../../../../../../../data/audio_coding
 EXEP=../../../../../../../out/Release
 OUTP=./GeneratedFiles
 mkdir ./GeneratedFiles

diff --git a/src/modules/audio_coding/main/test/APITest.cc b/src/modules/audio_coding/main/test/APITest.cc
@@ -264,7 +264,7 @@ APITest::SetUp()
     printf("Hit enter to accept the default values indicated in []\n\n");
 
     //--- Input A
-    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
+    strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 32000;
     printf("Enter input file at side A [%s]: ", fileName);
     PCMFile::ChooseFile(fileName, 499, &frequencyHz);
@@ -278,7 +278,7 @@ APITest::SetUp()
     _outFileA.Open(fileName, frequencyHz, "wb");
 
     //--- Input B
-    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
+    strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm");
     printf("\n\nEnter input file at side B [%s]: ", fileName);
     PCMFile::ChooseFile(fileName, 499, &frequencyHz);
     _inFileB.Open(fileName, frequencyHz, "rb", true);

diff --git a/src/modules/audio_coding/main/test/EncodeDecodeTest.cc b/src/modules/audio_coding/main/test/EncodeDecodeTest.cc
@@ -63,14 +63,14 @@ void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream) {
     // Set the codec, input file, and parameters for the current test.
     codecNo = codeId;
     // Use same input file for now.
-    char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
+    char fileName[] = "./data/audio_coding/testfile32kHz.pcm";
     _pcmFile.Open(fileName, 32000, "rb");
   } else if (testMode == 0) {
     // Set the codec, input file, and parameters for the current test.
     codecNo = codeId;
     acm->Codec(codecNo, sendCodec);
     // Use same input file for now.
-    char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
+    char fileName[] = "./data/audio_coding/testfile32kHz.pcm";
     _pcmFile.Open(fileName, 32000, "rb");
   } else {
     printf("List of supported codec.\n");
@@ -80,7 +80,7 @@ void Sender::Setup(AudioCodingModule *acm, RTPStream *rtpStream) {
     }
     printf("Choose your codec:");
     ASSERT_GT(scanf("%d", &codecNo), 0);
-    char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
+    char fileName[] = "./data/audio_coding/testfile32kHz.pcm";
     _pcmFile.Open(fileName, 32000, "rb");
   }
 

diff --git a/src/modules/audio_coding/main/test/SpatialAudio.cc b/src/modules/audio_coding/main/test/SpatialAudio.cc
@@ -56,7 +56,7 @@ SpatialAudio::Setup()
     char audioFileName[MAX_FILE_NAME_LENGTH_BYTE];
     WebRtc_UWord16 sampFreqHz = 32000;
 
-    strncpy(audioFileName, "./test/data/audio_coding/testfile32kHz.pcm",
+    strncpy(audioFileName, "./data/audio_coding/testfile32kHz.pcm",
             MAX_FILE_NAME_LENGTH_BYTE - 1);
     if(_testMode == 1)
     {

diff --git a/src/modules/audio_coding/main/test/TestAllCodecs.cc b/src/modules/audio_coding/main/test/TestAllCodecs.cc
@@ -141,7 +141,7 @@ TestAllCodecs::~TestAllCodecs()
 void TestAllCodecs::Perform()
 {
 
-    char file[] = "./test/data/audio_coding/testfile32kHz.pcm";
+    char file[] = "./data/audio_coding/testfile32kHz.pcm";
     _inFileA.Open(file, 32000, "rb");
 
     if(_testMode == 0)

diff --git a/src/modules/audio_coding/main/test/TestFEC.cc b/src/modules/audio_coding/main/test/TestFEC.cc
@@ -59,7 +59,7 @@ void TestFEC::Perform()
         WEBRTC_TRACE(kTraceStateInfo, kTraceAudioCoding, -1,
                      "---------- TestFEC ----------");
     }
-    char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
+    char fileName[] = "./data/audio_coding/testfile32kHz.pcm";
     _inFileA.Open(fileName, 32000, "rb");
 
 

diff --git a/src/modules/audio_coding/main/test/TestStereo.cc b/src/modules/audio_coding/main/test/TestStereo.cc
@@ -155,8 +155,8 @@ void TestStereo::Perform() {
                  "---------- TestStereo ----------");
   }
 
-  strcpy(file_name_stereo, "./test/data/audio_coding/teststereo32kHz.pcm");
-  strcpy(file_name_mono, "./test/data/audio_coding/testfile32kHz.pcm");
+  strcpy(file_name_stereo, "./data/audio_coding/teststereo32kHz.pcm");
+  strcpy(file_name_mono, "./data/audio_coding/testfile32kHz.pcm");
   frequency_hz = 32000;
 
   in_file_stereo_ = new PCMFile();

diff --git a/src/modules/audio_coding/main/test/TestVADDTX.cc b/src/modules/audio_coding/main/test/TestVADDTX.cc
@@ -59,7 +59,7 @@ void TestVADDTX::Perform()
         WEBRTC_TRACE(webrtc::kTraceStateInfo, webrtc::kTraceAudioCoding, -1,
                      "---------- TestVADDTX ----------");
     }
-    char fileName[] = "./test/data/audio_coding/testfile32kHz.pcm";
+    char fileName[] = "./data/audio_coding/testfile32kHz.pcm";
     _inFileA.Open(fileName, 32000, "rb");
 
     _acmA = AudioCodingModule::Create(0);

diff --git a/src/modules/audio_coding/main/test/TwoWayCommunication.cc b/src/modules/audio_coding/main/test/TwoWayCommunication.cc
@@ -203,7 +203,7 @@ WebRtc_Word16 TwoWayCommunication::SetUp()
     WebRtc_UWord16 frequencyHz;
 
     //--- Input A
-    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
+    strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 32000;
     printf("Enter input file at side A [%s]: ", fileName);
     ChooseFile(fileName, 499, &frequencyHz);
@@ -223,7 +223,7 @@ WebRtc_Word16 TwoWayCommunication::SetUp()
     _outFileRefA.Open(refFileName, frequencyHz, "wb");
 
     //--- Input B
-    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
+    strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 32000;
     printf("\n\nEnter input file at side B [%s]: ", fileName);
     ChooseFile(fileName, 499, &frequencyHz);
@@ -314,7 +314,7 @@ WebRtc_Word16 TwoWayCommunication::SetUpAutotest()
 
 
     //--- Input A
-    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
+    strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 16000;
     _inFileA.Open(fileName, frequencyHz, "rb");
 
@@ -328,7 +328,7 @@ WebRtc_Word16 TwoWayCommunication::SetUpAutotest()
     _outFileRefA.Open(refFileName, frequencyHz, "wb");
 
     //--- Input B
-    strcpy(fileName, "./test/data/audio_coding/testfile32kHz.pcm");
+    strcpy(fileName, "./data/audio_coding/testfile32kHz.pcm");
     frequencyHz = 16000;
     _inFileB.Open(fileName, frequencyHz, "rb");
 

diff --git a/src/modules/audio_coding/main/test/iSACTest.cc b/src/modules/audio_coding/main/test/iSACTest.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -184,7 +184,7 @@ ISACTest::Setup()
     CHECK_ERROR(_acmB->RegisterTransportCallback(_channel_B2A));
     _channel_B2A->RegisterReceiverACM(_acmA);
 
-    strncpy(_fileNameSWB, "./test/data/audio_coding/testfile32kHz.pcm",
+    strncpy(_fileNameSWB, "./data/audio_coding/testfile32kHz.pcm",
             MAX_FILE_NAME_LENGTH_BYTE);
 
     _acmB->RegisterSendCodec(_paramISAC16kHz);

diff --git a/src/modules/audio_device/main/test/func_test_manager.cc b/src/modules/audio_device/main/test/func_test_manager.cc
@@ -559,7 +559,7 @@ WebRtc_Word32 AudioTransportImpl::NeedMorePlayData(
 
 FuncTestManager::FuncTestManager() :
     _resourcePath(webrtc::test::ProjectRootPath() +
-        "test/data/audio_device/"),
+        "data/audio_device/"),
     _processThread(NULL),
     _audioDevice(NULL),
     _audioEventObserver(NULL),

diff --git a/src/modules/audio_processing/test/unit_test.cc b/src/modules/audio_processing/test/unit_test.cc
@@ -109,7 +109,7 @@ class ApmTest : public ::testing::Test {
 ApmTest::ApmTest()
     : output_path_(webrtc::test::OutputPath()),
       ref_path_(webrtc::test::ProjectRootPath() +
-                "test/data/audio_processing/"),
+                "data/audio_processing/"),
 #if defined(WEBRTC_AUDIOPROC_FIXED_PROFILE)
       ref_filename_(ref_path_ + "output_data_fixed.pb"),
 #elif defined(WEBRTC_AUDIOPROC_FLOAT_PROFILE)

diff --git a/src/modules/media_file/source/media_file_unittest.cc b/src/modules/media_file/source/media_file_unittest.cc
@@ -31,7 +31,7 @@ TEST_F(MediaFileTest, StartPlayingAudioFileWithoutError) {
   // TODO(leozwang): Use hard coded filename here, we want to
   // loop through all audio files in future
   const std::string audio_file = webrtc::test::ProjectRootPath() +
-      "test/data/voice_engine/audio_tiny48.wav";
+      "data/voice_engine/audio_tiny48.wav";
   ASSERT_EQ(0, media_file_->StartPlayingAudioFile(
       audio_file.c_str(),
       0,

diff --git a/src/voice_engine/main/test/auto_test/resource_manager.cc b/src/voice_engine/main/test/auto_test/resource_manager.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -22,7 +22,7 @@ ResourceManager::ResourceManager() {
     long_audio_file_path_ = "";
   } else {
     long_audio_file_path_ =
-        resource_path + "test/data/voice_engine/" + filename;
+        resource_path + "data/voice_engine/" + filename;
   }
 #endif
 }

diff --git a/src/voice_engine/main/test/cmd_test/voe_cmd_test.cc b/src/voice_engine/main/test/cmd_test/voe_cmd_test.cc
@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
@@ -253,7 +253,7 @@ void RunTest(std::string out_path) {
     // Fall back to the current directory.
     resource_path = "./";
   } else {
-    resource_path += "test/data/voice_engine/";
+    resource_path += "data/voice_engine/";
   }
 #endif
   const std::string audio_filename = resource_path + "audio_long16.pcm";

diff --git a/src/voice_engine/main/test/win_test/WinTestDlg.cc b/src/voice_engine/main/test/win_test/WinTestDlg.cc
@@ -2304,7 +2304,7 @@ void CWinTestDlg::OnBnClickedCheckExtTrans2()
 void CWinTestDlg::OnBnClickedCheckPlayFileIn1()
 {
     // File path is relative to the location of 'voice_engine.gyp'.
-    const char micFile[] = "../test/data/voice_engine/audio_short16.pcm";
+    const char micFile[] = "../data/voice_engine/audio_short16.pcm";
 
     int ret(0);
     int channel = GetDlgItemInt(IDC_EDIT_1);
@@ -2339,7 +2339,7 @@ void CWinTestDlg::OnBnClickedCheckPlayFileIn1()
 void CWinTestDlg::OnBnClickedCheckPlayFileIn2()
 {
     // File path is relative to the location of 'voice_engine.gyp'.
-    const char micFile[] = "../test/data/voice_engine/audio_long16.pcm";
+    const char micFile[] = "../data/voice_engine/audio_long16.pcm";
 
     int ret(0);
     int channel = GetDlgItemInt(IDC_EDIT_2);
@@ -2382,14 +2382,14 @@ void CWinTestDlg::OnBnClickedCheckPlayFileOut1()
                                           {kFileFormatWavFile},
                                           {kFileFormatWavFile}};
     // File path is relative to the location of 'voice_engine.gyp'.
-    const char spkrFiles[8][64] = {{"../../test/data/voice_engine/audio_short16.pcm"},
-                                   {"../../test/data/voice_engine/audio_tiny8.wav"},
-                                   {"../../test/data/voice_engine/audio_tiny11.wav"},
-                                   {"../../test/data/voice_engine/audio_tiny16.wav"},
-                                   {"../../test/data/voice_engine/audio_tiny22.wav"},
-                                   {"../../test/data/voice_engine/audio_tiny32.wav"},
-                                   {"../../test/data/voice_engine/audio_tiny44.wav"},
-                                   {"../../test/data/voice_engine/audio_tiny48.wav"}};
+    const char spkrFiles[8][64] = {{"../../data/voice_engine/audio_short16.pcm"},
+                                   {"../../data/voice_engine/audio_tiny8.wav"},
+                                   {"../../data/voice_engine/audio_tiny11.wav"},
+                                   {"../../data/voice_engine/audio_tiny16.wav"},
+                                   {"../../data/voice_engine/audio_tiny22.wav"},
+                                   {"../../data/voice_engine/audio_tiny32.wav"},
+                                   {"../../data/voice_engine/audio_tiny44.wav"},
+                                   {"../../data/voice_engine/audio_tiny48.wav"}};
     int ret(0);
     int channel = GetDlgItemInt(IDC_EDIT_1);
     CButton* button = (CButton*)GetDlgItem(IDC_CHECK_PLAY_FILE_OUT_1);
@@ -2434,7 +2434,7 @@ void CWinTestDlg::OnBnClickedCheckPlayFileOut1()
 void CWinTestDlg::OnBnClickedCheckPlayFileOut2()
 {
     // File path is relative to the location of 'voice_engine.gyp'.
-    const char spkrFile[] = "../test/data/voice_engine/audio_long16.pcm";
+    const char spkrFile[] = "../data/voice_engine/audio_long16.pcm";
 
     int ret(0);
     int channel = GetDlgItemInt(IDC_EDIT_2);
@@ -3095,8 +3095,8 @@ void CWinTestDlg::OnBnClickedCheckNs1()
 void CWinTestDlg::OnBnClickedCheckPlayFileIn()
 {
     // File path is relative to the location of 'voice_engine.gyp'.
-    const char micFile[] = "../../test/data/voice_engine/audio_short16.pcm";
-    // const char micFile[] = "../../test/data/voice_engine/audio_long16noise.pcm";
+    const char micFile[] = "../../data/voice_engine/audio_short16.pcm";
+    // const char micFile[] = "../../data/voice_engine/audio_long16noise.pcm";
 
     int channel(-1);
     CButton* buttonExtTrans = (CButton*)GetDlgItem(IDC_CHECK_PLAY_FILE_IN);