Removed unused fixture.

Updated environment variable error message
genba · Dec 15, 2015 · 4df3ed2 · 4df3ed2
1 parent 449a84f
commit 4df3ed2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/Tests/UnitTests/ReaderTests/Common/ReaderTestHelper.h b/Tests/UnitTests/ReaderTests/Common/ReaderTestHelper.h
@@ -61,6 +61,10 @@ namespace Microsoft {  namespace MSR {  namespace CNTK
                         else
                         {
                             BOOST_TEST_MESSAGE("Invalid environment variable: " + subPath);
+                            fprintf(stderr, "Invalid environment variable: %s ", subPath.c_str());
+
+                            BOOST_TEST_MESSAGE("This test uses external data that is not part of the CNTK repository. Environment variable CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY must be set to point to the external test data location. \n Refer to the 'Setting up CNTK on Windows' documentation.)");
+                            fprintf(stderr, "This test uses external data that is not part of the CNTK repository. Environment variable CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY must be set to point to the external test data location. \n Refer to the 'Setting up CNTK on Windows' documentation.)");
                             newCurrentPath = m_testDataPath;
                         }
                     }

diff --git a/Tests/UnitTests/ReaderTests/HTKLMFReaderTests.cpp b/Tests/UnitTests/ReaderTests/HTKLMFReaderTests.cpp
@@ -18,15 +18,6 @@ namespace Microsoft {  namespace MSR  {  namespace CNTK
             {}
         };
 
-        // Fixture specific for the TIMIT data
-        struct TIMITReaderFixture : ReaderFixture
-        {
-            TIMITReaderFixture() : ReaderFixture("%CNTK_EXTERNAL_TESTDATA_SOURCE_DIRECTORY%/Speech/ASR")
-            {
-                m_maxMiniBatchCount = 4;
-            }
-        };
-
         // Use SpeechReaderFixture for most tests
         // Some of them (e.g. 10, will use different data, thus a different fixture)
         BOOST_FIXTURE_TEST_SUITE(ReaderTestSuite, AN4ReaderFixture)