summary refs log tree commit diff
path: root/crypto/test/src
diff options
context:
space:
mode:
authorPeter Dettman <peter.dettman@bouncycastle.org>2015-11-22 23:25:51 +0700
committerPeter Dettman <peter.dettman@bouncycastle.org>2015-11-22 23:25:51 +0700
commitdd12d4c4db7a6cedb11e83a8952a75bf0e783aee (patch)
tree1f42ccdb16d8c0bfbaf955c716c625045aa27aa8 /crypto/test/src
parentMore release preparation (diff)
parentMerge branch 'master' into vs2010 (diff)
downloadBouncyCastle.NET-ed25519-dd12d4c4db7a6cedb11e83a8952a75bf0e783aee.tar.xz
Merge branch 'vs2010' of https://github.com/jstedfast/bc-csharp into jstedfast-vs2010
- https://github.com/bcgit/bc-csharp/pull/22
Diffstat (limited to 'crypto/test/src')
-rw-r--r--crypto/test/src/util/test/SimpleTest.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/test/src/util/test/SimpleTest.cs b/crypto/test/src/util/test/SimpleTest.cs
index faeee65c9..bf6c8fb92 100644
--- a/crypto/test/src/util/test/SimpleTest.cs
+++ b/crypto/test/src/util/test/SimpleTest.cs
@@ -115,7 +115,9 @@ namespace Org.BouncyCastle.Utilities.Test
 		private static string GetFullName(
 			string name)
 		{
-#if PORTABLE
+#if SEPARATE_UNIT_TESTS
+			return "UnitTests.data." + name;
+#elif PORTABLE
 			return "crypto.tests." + name;
 #else
             return "crypto.test.data." + name;
@@ -125,7 +127,9 @@ namespace Org.BouncyCastle.Utilities.Test
 		private static string GetShortName(
 			string fullName)
 		{
-#if PORTABLE
+#if SEPARATE_UNIT_TESTS
+			return fullName.Substring("UnitTests.data.".Length);
+#elif PORTABLE
 			return fullName.Substring("crypto.tests.".Length);
 #else
             return fullName.Substring("crypto.test.data.".Length);