From d4856e50c8bf4ee7bda0371f3dea205f9f1d3870 Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Fri, 8 Aug 2014 15:06:20 +0200
Subject: [PATCH 1/2] Move comment above commented line.

---
 core/modules/block/src/Tests/BlockConfigSchemaTest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/modules/block/src/Tests/BlockConfigSchemaTest.php b/core/modules/block/src/Tests/BlockConfigSchemaTest.php
index 69b5e9d..6cae8e1 100644
--- a/core/modules/block/src/Tests/BlockConfigSchemaTest.php
+++ b/core/modules/block/src/Tests/BlockConfigSchemaTest.php
@@ -32,7 +32,8 @@ class BlockConfigSchemaTest extends KernelTestBase {
     'forum',
     'node',
     'statistics',
-    'system', // BlockManager->getModuleName() -> system_get_info()
+    // BlockManager->getModuleName() calls system_get_info().
+    'system',
     'taxonomy',
   );
 
-- 
1.7.11.msysgit.1


From 248f12eba474a420cbb450fb392f9776ff1f7671 Mon Sep 17 00:00:00 2001
From: sun <sun@unleashedmind.com>
Date: Fri, 8 Aug 2014 15:07:04 +0200
Subject: [PATCH 2/2] Reverted changes that are only required for KTBNG.

---
 core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php | 2 +-
 core/modules/system/src/Tests/File/DirectoryTest.php   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php
index a61c9ca..e0502c7 100644
--- a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php
+++ b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php
@@ -43,7 +43,7 @@
    *
    * @var bool
    */
-  protected $debug = FALSE;
+  protected $debug = TRUE;
 
   /**
    * Modules to enable.
diff --git a/core/modules/system/src/Tests/File/DirectoryTest.php b/core/modules/system/src/Tests/File/DirectoryTest.php
index b402227..158be71 100644
--- a/core/modules/system/src/Tests/File/DirectoryTest.php
+++ b/core/modules/system/src/Tests/File/DirectoryTest.php
@@ -30,8 +30,8 @@ function testFileCheckLocalDirectoryHandling() {
     $old_mode = fileperms($directory);
 
     // Create the directories.
-    $parent_path = $directory . '/' . $parent;
-    $child_path = $parent_path . '/' . $child;
+    $parent_path = $directory . DIRECTORY_SEPARATOR . $parent;
+    $child_path = $parent_path . DIRECTORY_SEPARATOR . $child;
     $this->assertTrue(drupal_mkdir($child_path, 0775, TRUE), t('No error reported when creating new local directories.'), 'File');
 
     // Ensure new directories also exist.
@@ -46,7 +46,7 @@ function testFileCheckLocalDirectoryHandling() {
     $this->assertDirectoryPermissions($directory, $old_mode);
 
     // Check creating a directory using an absolute path.
-    $absolute_path = drupal_realpath($directory) . '/' . $this->randomMachineName() . '/' . $this->randomMachineName();
+    $absolute_path = drupal_realpath($directory) . DIRECTORY_SEPARATOR . $this->randomMachineName() . DIRECTORY_SEPARATOR . $this->randomMachineName();
     $this->assertTrue(drupal_mkdir($absolute_path, 0775, TRUE), 'No error reported when creating new absolute directories.', 'File');
     $this->assertDirectoryPermissions($absolute_path, 0775);
   }
-- 
1.7.11.msysgit.1