kerneltest/f32test/server/t_falsespace.cpp
changeset 90 947f0dc9f7a8
parent 33 0173bcd7697c
child 109 b3a1d9898418
child 117 5b5d147c7838
child 131 e880629062dd
--- a/kerneltest/f32test/server/t_falsespace.cpp	Tue Feb 02 01:24:03 2010 +0200
+++ b/kerneltest/f32test/server/t_falsespace.cpp	Fri Apr 16 16:24:37 2010 +0300
@@ -1062,13 +1062,6 @@
 	{
     //-- set up console output 
     Fat_Test_Utils::SetConsole(test.Console()); 
-
-
-	if (gSessionPath[0]=='C')	//only test on non C drives
-		{
-		test.Printf(_L("TEST NOT RUN FOR THIS DRIVE"));
-		return;
-		}
 	
 	if (UserSvr::DebugMask(2)&0x00000002) // TESTFAST mode set? (for automated test builds)
 		if(IsTestingLFFS())
@@ -1086,6 +1079,23 @@
 	r=RFs::DriveToChar(gTestDrive,gCh);
 	test(r==KErrNone);
 
+    TDriveInfo drv;
+    r = TheFs.Drive(drv, gTestDrive);
+    test(r == KErrNone);
+
+    if (Is_Win32(TheFs, gTestDrive))
+        {
+        test.Printf(_L("Skipping on emulator %C: drive\n"), gSessionPath[0]);
+        return;
+        }
+
+    // do not run this test on RAM drive
+    if (drv.iType == EMediaRam)
+        {
+        test.Printf(_L("Test can't run on RAM drive %C:\n"), gSessionPath[0]);
+        return;
+        }
+
     //-- print drive information
     PrintDrvInfo(TheFs, gTestDrive);