Use properly flag names for tests of Tools/Scripts/run-builtins-generator-tests
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Jul 2020 07:09:45 +0000 (07:09 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 1 Jul 2020 07:09:45 +0000 (07:09 +0000)
https://bugs.webkit.org/show_bug.cgi?id=213733

Patch by Tetsuharu Ohzeki <tetsuharu.ohzeki@gmail.com> on 2020-07-01
Reviewed by Youenn Fablet.

Test cases under Source/JavaScriptCore/Scripts/tests/builtins/ uses exist compilation flags.
But they can take an arbitary flag name and don't have to use an exist flag.
I think it's better to rename them to more proper ones.

* Scripts/tests/builtins/WebCore-ArbitraryConditionalGuard-Separate.js:
* Scripts/tests/builtins/WebCore-DuplicateKeyValueAnnotation-Separate.js:
* Scripts/tests/builtins/WebCore-GuardedBuiltin-Separate.js:
* Scripts/tests/builtins/WebCore-GuardedInternalBuiltin-Separate.js:
* Scripts/tests/builtins/WebCore-xmlCasingTest-Separate.js:
* Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
* Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
* Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@263790 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/Scripts/tests/builtins/WebCore-ArbitraryConditionalGuard-Separate.js
Source/JavaScriptCore/Scripts/tests/builtins/WebCore-DuplicateKeyValueAnnotation-Separate.js
Source/JavaScriptCore/Scripts/tests/builtins/WebCore-GuardedBuiltin-Separate.js
Source/JavaScriptCore/Scripts/tests/builtins/WebCore-GuardedInternalBuiltin-Separate.js
Source/JavaScriptCore/Scripts/tests/builtins/WebCore-xmlCasingTest-Separate.js
Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result
Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result
Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result
Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result
Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result

index 77128ce..113bab5 100644 (file)
@@ -1,3 +1,25 @@
+2020-07-01  Tetsuharu Ohzeki  <tetsuharu.ohzeki@gmail.com>
+
+        Use properly flag names for tests of Tools/Scripts/run-builtins-generator-tests
+        https://bugs.webkit.org/show_bug.cgi?id=213733
+
+        Reviewed by Youenn Fablet.
+
+        Test cases under Source/JavaScriptCore/Scripts/tests/builtins/ uses exist compilation flags.
+        But they can take an arbitary flag name and don't have to use an exist flag.
+        I think it's better to rename them to more proper ones.
+
+        * Scripts/tests/builtins/WebCore-ArbitraryConditionalGuard-Separate.js:
+        * Scripts/tests/builtins/WebCore-DuplicateKeyValueAnnotation-Separate.js:
+        * Scripts/tests/builtins/WebCore-GuardedBuiltin-Separate.js:
+        * Scripts/tests/builtins/WebCore-GuardedInternalBuiltin-Separate.js:
+        * Scripts/tests/builtins/WebCore-xmlCasingTest-Separate.js:
+        * Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
+        * Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
+        * Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
+        * Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
+        * Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result:
+
 2020-06-30  Peng Liu  <peng.liu6@apple.com>
 
         Enable the support of FULLSCREEN_API in WebKitTestRunner
index c808b3c..26144fe 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// @conditional=ENABLE(STREAMS_API) || USE(CF)
+// @conditional=ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
 
 function isReadableStreamLocked(stream)
 {
index 6d6fe60..31df86e 100644 (file)
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// @conditional=ENABLE(STREAMS_API)
-// @conditional=USE(CF)
+// @conditional=ENABLE(TEST_DUPULICATE_KEY_VALUE_ANNOTATION_SEPARATE_A)
+// @conditional=USE(TEST_DUPULICATE_KEY_VALUE_ANNOTATION_SEPARATE_B)
 
 function isReadableStreamLocked(stream)
 {
index 2acec58..d4a12bc 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// @conditional=ENABLE(STREAMS_API)
+// @conditional=ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
 
 function isReadableStreamLocked(stream)
 {
index e95e0c2..6f734ec 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// @conditional=ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+// @conditional=ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
 // @internal
 
 function isReadableStreamLocked(stream)
index 550c89e..c35ae92 100644 (file)
@@ -23,7 +23,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// @conditional=ENABLE(STREAMS_API)
+// @conditional=ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 // @internal
 
 function xmlCasingTest(stream)
index ce18ba1..54245c2 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(STREAMS_API) || USE(CF)
+#if ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
 
 #include <JavaScriptCore/BuiltinUtils.h>
 #include <JavaScriptCore/Identifier.h>
@@ -124,7 +124,7 @@ inline void ArbitraryConditionalGuardBuiltinsWrapper::exportNames()
 
 } // namespace WebCore
 
-#endif // ENABLE(STREAMS_API) || USE(CF)
+#endif // ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
 ### End File: ArbitraryConditionalGuardBuiltins.h
 
 ### Begin File: ArbitraryConditionalGuardBuiltins.cpp
@@ -161,7 +161,7 @@ inline void ArbitraryConditionalGuardBuiltinsWrapper::exportNames()
 #include "config.h"
 #include "ArbitraryConditionalGuardBuiltins.h"
 
-#if ENABLE(STREAMS_API) || USE(CF)
+#if ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
 
 #include "WebCoreJSClientData.h"
 #include <JavaScriptCore/HeapInlines.h>
@@ -200,6 +200,6 @@ WEBCORE_FOREACH_ARBITRARYCONDITIONALGUARD_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
 
 } // namespace WebCore
 
-#endif // ENABLE(STREAMS_API) || USE(CF)
+#endif // ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
 
 ### End File: ArbitraryConditionalGuardBuiltins.cpp
index eef68ef..3a13843 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(STREAMS_API)
+#if ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
 
 #include <JavaScriptCore/BuiltinUtils.h>
 #include <JavaScriptCore/Identifier.h>
@@ -124,7 +124,7 @@ inline void GuardedBuiltinBuiltinsWrapper::exportNames()
 
 } // namespace WebCore
 
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
 ### End File: GuardedBuiltinBuiltins.h
 
 ### Begin File: GuardedBuiltinBuiltins.cpp
@@ -161,7 +161,7 @@ inline void GuardedBuiltinBuiltinsWrapper::exportNames()
 #include "config.h"
 #include "GuardedBuiltinBuiltins.h"
 
-#if ENABLE(STREAMS_API)
+#if ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
 
 #include "WebCoreJSClientData.h"
 #include <JavaScriptCore/HeapInlines.h>
@@ -200,6 +200,6 @@ WEBCORE_FOREACH_GUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
 
 } // namespace WebCore
 
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
 
 ### End File: GuardedBuiltinBuiltins.cpp
index 0a5cb88..37c2324 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
 
 #include <JavaScriptCore/BuiltinUtils.h>
 #include <JavaScriptCore/Identifier.h>
@@ -156,7 +156,7 @@ inline void GuardedInternalBuiltinBuiltinFunctions::visit(JSC::SlotVisitor& visi
 
 } // namespace WebCore
 
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
 ### End File: GuardedInternalBuiltinBuiltins.h
 
 ### Begin File: GuardedInternalBuiltinBuiltins.cpp
@@ -193,7 +193,7 @@ inline void GuardedInternalBuiltinBuiltinFunctions::visit(JSC::SlotVisitor& visi
 #include "config.h"
 #include "GuardedInternalBuiltinBuiltins.h"
 
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
 
 #include "WebCoreJSClientData.h"
 #include <JavaScriptCore/HeapInlines.h>
@@ -232,6 +232,6 @@ WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
 
 } // namespace WebCore
 
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
 
 ### End File: GuardedInternalBuiltinBuiltins.cpp
index f79934e..530d033 100644 (file)
@@ -31,7 +31,7 @@
 
 #pragma once
 
-#if ENABLE(STREAMS_API)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 
 #include <JavaScriptCore/BuiltinUtils.h>
 #include <JavaScriptCore/Identifier.h>
@@ -172,7 +172,7 @@ inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
 
 } // namespace WebCore
 
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 ### End File: xmlCasingTestBuiltins.h
 
 ### Begin File: xmlCasingTestBuiltins.cpp
@@ -209,7 +209,7 @@ inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
 #include "config.h"
 #include "xmlCasingTestBuiltins.h"
 
-#if ENABLE(STREAMS_API)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 
 #include "WebCoreJSClientData.h"
 #include <JavaScriptCore/HeapInlines.h>
@@ -289,6 +289,6 @@ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
 
 } // namespace WebCore
 
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 
 ### End File: xmlCasingTestBuiltins.cpp
index 2d93e5d..9cf3868 100644 (file)
@@ -48,66 +48,66 @@ public:
 #if ENABLE(FETCH_API)
         , m_anotherGuardedInternalBuiltinBuiltins(m_vm)
 #endif // ENABLE(FETCH_API)
-#if ENABLE(STREAMS_API) || USE(CF)
+#if ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
         , m_arbitraryConditionalGuardBuiltins(m_vm)
-#endif // ENABLE(STREAMS_API) || USE(CF)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
+#if ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
         , m_guardedBuiltinBuiltins(m_vm)
-#endif // ENABLE(STREAMS_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#endif // ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
         , m_guardedInternalBuiltinBuiltins(m_vm)
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
         , m_unguardedBuiltinBuiltins(m_vm)
-#if ENABLE(STREAMS_API)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
         , m_xmlCasingTestBuiltins(m_vm)
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     {
 #if ENABLE(FETCH_API)
         m_anotherGuardedInternalBuiltinBuiltins.exportNames();
 #endif // ENABLE(FETCH_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
         m_guardedInternalBuiltinBuiltins.exportNames();
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
         m_xmlCasingTestBuiltins.exportNames();
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     }
 
 #if ENABLE(FETCH_API)
     AnotherGuardedInternalBuiltinBuiltinsWrapper& anotherGuardedInternalBuiltinBuiltins() { return m_anotherGuardedInternalBuiltinBuiltins; }
 #endif // ENABLE(FETCH_API)
-#if ENABLE(STREAMS_API) || USE(CF)
+#if ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
     ArbitraryConditionalGuardBuiltinsWrapper& arbitraryConditionalGuardBuiltins() { return m_arbitraryConditionalGuardBuiltins; }
-#endif // ENABLE(STREAMS_API) || USE(CF)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
+#if ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
     GuardedBuiltinBuiltinsWrapper& guardedBuiltinBuiltins() { return m_guardedBuiltinBuiltins; }
-#endif // ENABLE(STREAMS_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#endif // ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     GuardedInternalBuiltinBuiltinsWrapper& guardedInternalBuiltinBuiltins() { return m_guardedInternalBuiltinBuiltins; }
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     UnguardedBuiltinBuiltinsWrapper& unguardedBuiltinBuiltins() { return m_unguardedBuiltinBuiltins; }
-#if ENABLE(STREAMS_API)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     XMLCasingTestBuiltinsWrapper& xmlCasingTestBuiltins() { return m_xmlCasingTestBuiltins; }
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 
 private:
     JSC::VM& m_vm;
 #if ENABLE(FETCH_API)
     AnotherGuardedInternalBuiltinBuiltinsWrapper m_anotherGuardedInternalBuiltinBuiltins;
 #endif // ENABLE(FETCH_API)
-#if ENABLE(STREAMS_API) || USE(CF)
+#if ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
     ArbitraryConditionalGuardBuiltinsWrapper m_arbitraryConditionalGuardBuiltins;
-#endif // ENABLE(STREAMS_API) || USE(CF)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
+#if ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
     GuardedBuiltinBuiltinsWrapper m_guardedBuiltinBuiltins;
-#endif // ENABLE(STREAMS_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#endif // ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     GuardedInternalBuiltinBuiltinsWrapper m_guardedInternalBuiltinBuiltins;
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     UnguardedBuiltinBuiltinsWrapper m_unguardedBuiltinBuiltins;
-#if ENABLE(STREAMS_API)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     XMLCasingTestBuiltinsWrapper m_xmlCasingTestBuiltins;
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 };
 
 } // namespace WebCore
@@ -205,24 +205,24 @@ public:
 #if ENABLE(FETCH_API)
     AnotherGuardedInternalBuiltinBuiltinFunctions& anotherGuardedInternalBuiltin() { return m_anotherGuardedInternalBuiltin; }
 #endif // ENABLE(FETCH_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     GuardedInternalBuiltinBuiltinFunctions& guardedInternalBuiltin() { return m_guardedInternalBuiltin; }
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     XMLCasingTestBuiltinFunctions& xmlCasingTest() { return m_xmlCasingTest; }
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 
 private:
     JSC::VM& m_vm;
 #if ENABLE(FETCH_API)
     AnotherGuardedInternalBuiltinBuiltinFunctions m_anotherGuardedInternalBuiltin;
 #endif // ENABLE(FETCH_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     GuardedInternalBuiltinBuiltinFunctions m_guardedInternalBuiltin;
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     XMLCasingTestBuiltinFunctions m_xmlCasingTest;
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 };
 
 } // namespace WebCore
@@ -276,12 +276,12 @@ JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& vm)
 #if ENABLE(FETCH_API)
     , m_anotherGuardedInternalBuiltin(m_vm)
 #endif // ENABLE(FETCH_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     , m_guardedInternalBuiltin(m_vm)
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     , m_xmlCasingTest(m_vm)
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 {
     UNUSED_PARAM(vm);
 }
@@ -291,12 +291,12 @@ void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
 #if ENABLE(FETCH_API)
     m_anotherGuardedInternalBuiltin.visit(visitor);
 #endif // ENABLE(FETCH_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     m_guardedInternalBuiltin.visit(visitor);
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     m_xmlCasingTest.visit(visitor);
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     UNUSED_PARAM(visitor);
 }
 
@@ -306,14 +306,14 @@ void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
 #if ENABLE(FETCH_API)
     m_anotherGuardedInternalBuiltin.init(globalObject);
 #endif // ENABLE(FETCH_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
     m_guardedInternalBuiltin.init(globalObject);
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     m_xmlCasingTest.init(globalObject);
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 
-#if ENABLE(FETCH_API) || ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API) || ENABLE(STREAMS_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B) || ENABLE(FETCH_API) || ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     JSVMClientData& clientData = *static_cast<JSVMClientData*>(m_vm.clientData);
     JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
 #if ENABLE(FETCH_API)
@@ -323,24 +323,24 @@ void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject)
     WEBCORE_FOREACH_ANOTHERGUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
 #undef DECLARE_GLOBAL_STATIC
 #endif // ENABLE(FETCH_API)
-#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
+#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
 #define DECLARE_GLOBAL_STATIC(name) \
     JSDOMGlobalObject::GlobalPropertyInfo( \
         clientData.builtinFunctions().guardedInternalBuiltinBuiltins().name##PrivateName(), guardedInternalBuiltin().m_##name##Function.get() , JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly),
     WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
 #undef DECLARE_GLOBAL_STATIC
-#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
-#if ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
+#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 #define DECLARE_GLOBAL_STATIC(name) \
     JSDOMGlobalObject::GlobalPropertyInfo( \
         clientData.builtinFunctions().xmlCasingTestBuiltins().name##PrivateName(), xmlCasingTest().m_##name##Function.get() , JSC::PropertyAttribute::DontDelete | JSC::PropertyAttribute::ReadOnly),
     WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_FUNCTION_NAME(DECLARE_GLOBAL_STATIC)
 #undef DECLARE_GLOBAL_STATIC
-#endif // ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
     };
     globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
     UNUSED_PARAM(clientData);
-#endif // ENABLE(FETCH_API) || ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API) || ENABLE(STREAMS_API)
+#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B) || ENABLE(FETCH_API) || ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
 }
 
 } // namespace WebCore