Fix test compilation. Add check for decryption support being enabled. Add...

Fix test compilation. Add check for decryption support being enabled. Add meaningful message if trying to load an encrypted file without decryption support.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2987 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CZipReader.cpp

@@ -655,6 +655,10 @@ IReadFile* CZipReader::createAndOpenFile(u32 index)
 			return 0; // zlib not compiled, we cannot decompress the data.
 			#endif
 		}
+	case 99:
+		// If we come here with an encrypted file, decryption support is missing
+		os::Printer::log("Decryption support not enabled. File cannot be read.", ELL_ERROR);
+		return 0;
 	default:
 		swprintf ( buf, 64, L"file has unsupported compression method. %s", Files[index].FullName.c_str() );
 		os::Printer::log( buf, ELL_ERROR);

tests/archiveReader.cpp

@@ -152,6 +152,7 @@ bool testEncryptedZip(IFileSystem* fs)
 
 	archive->Password="33445";
 	readFile = fs->createAndOpenFile(filename);
+#ifdef _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
 	if ( !readFile )
 	{
 		logTestString("createAndOpenFile failed\n");
@@ -165,6 +166,7 @@ bool testEncryptedZip(IFileSystem* fs)
 		logTestString("Read bad data from archive: %s\n", tmp);
 		return false;
 	}
+#endif
 
 	if (!fs->removeFileArchive(fs->getFileArchiveCount()-1))
 	{

tests/tests-last-passed-at.txt

-Test suite pass at GMT Fri Dec  4 18:41:12 2009
+Test suite pass at GMT Sat Dec 05 11:03:29 2009
 

tests/tests_vc9.vcproj

@@ -286,6 +286,10 @@
 				RelativePath=".\terrainSceneNode.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\testArray.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\testDimension2d.cpp"
 				>