Skip to content

Commit 9a435f1

Browse files
tetsuharuohzekiwebkit-commit-queue
tetsuharuohzeki
authored and
webkit-commit-queue
committed
Use properly flag names for tests of Tools/Scripts/run-builtins-generator-tests
https://bugs.webkit.org/show_bug.cgi?id=213733 Patch by Tetsuharu Ohzeki <[email protected]> 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: Canonical link: https://commits.webkit.org/226633@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@263790 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 726a271 commit 9a435f1

11 files changed

Lines changed: 98 additions & 76 deletions

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
2020-07-01 Tetsuharu Ohzeki <[email protected]>
2+
3+
Use properly flag names for tests of Tools/Scripts/run-builtins-generator-tests
4+
https://bugs.webkit.org/show_bug.cgi?id=213733
5+
6+
Reviewed by Youenn Fablet.
7+
8+
Test cases under Source/JavaScriptCore/Scripts/tests/builtins/ uses exist compilation flags.
9+
But they can take an arbitary flag name and don't have to use an exist flag.
10+
I think it's better to rename them to more proper ones.
11+
12+
* Scripts/tests/builtins/WebCore-ArbitraryConditionalGuard-Separate.js:
13+
* Scripts/tests/builtins/WebCore-DuplicateKeyValueAnnotation-Separate.js:
14+
* Scripts/tests/builtins/WebCore-GuardedBuiltin-Separate.js:
15+
* Scripts/tests/builtins/WebCore-GuardedInternalBuiltin-Separate.js:
16+
* Scripts/tests/builtins/WebCore-xmlCasingTest-Separate.js:
17+
* Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result:
18+
* Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result:
19+
* Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result:
20+
* Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result:
21+
* Scripts/tests/builtins/expected/WebCoreJSBuiltins.h-result:
22+
123
2020-06-30 Peng Liu <[email protected]>
224

325
Enable the support of FULLSCREEN_API in WebKitTestRunner

‎Source/JavaScriptCore/Scripts/tests/builtins/WebCore-ArbitraryConditionalGuard-Separate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
// @conditional=ENABLE(STREAMS_API) || USE(CF)
26+
// @conditional=ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
2727

2828
function isReadableStreamLocked(stream)
2929
{

‎Source/JavaScriptCore/Scripts/tests/builtins/WebCore-DuplicateKeyValueAnnotation-Separate.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
// @conditional=ENABLE(STREAMS_API)
27-
// @conditional=USE(CF)
26+
// @conditional=ENABLE(TEST_DUPULICATE_KEY_VALUE_ANNOTATION_SEPARATE_A)
27+
// @conditional=USE(TEST_DUPULICATE_KEY_VALUE_ANNOTATION_SEPARATE_B)
2828

2929
function isReadableStreamLocked(stream)
3030
{

‎Source/JavaScriptCore/Scripts/tests/builtins/WebCore-GuardedBuiltin-Separate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
// @conditional=ENABLE(STREAMS_API)
26+
// @conditional=ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
2727

2828
function isReadableStreamLocked(stream)
2929
{

‎Source/JavaScriptCore/Scripts/tests/builtins/WebCore-GuardedInternalBuiltin-Separate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
// @conditional=ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
26+
// @conditional=ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
2727
// @internal
2828

2929
function isReadableStreamLocked(stream)

‎Source/JavaScriptCore/Scripts/tests/builtins/WebCore-xmlCasingTest-Separate.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424
*/
2525

26-
// @conditional=ENABLE(STREAMS_API)
26+
// @conditional=ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
2727
// @internal
2828

2929
function xmlCasingTest(stream)

‎Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-ArbitraryConditionalGuard-Separate.js-result‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#pragma once
3333

34-
#if ENABLE(STREAMS_API) || USE(CF)
34+
#if ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
3535

3636
#include <JavaScriptCore/BuiltinUtils.h>
3737
#include <JavaScriptCore/Identifier.h>
@@ -124,7 +124,7 @@ inline void ArbitraryConditionalGuardBuiltinsWrapper::exportNames()
124124

125125
} // namespace WebCore
126126

127-
#endif // ENABLE(STREAMS_API) || USE(CF)
127+
#endif // ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
128128
### End File: ArbitraryConditionalGuardBuiltins.h
129129

130130
### Begin File: ArbitraryConditionalGuardBuiltins.cpp
@@ -161,7 +161,7 @@ inline void ArbitraryConditionalGuardBuiltinsWrapper::exportNames()
161161
#include "config.h"
162162
#include "ArbitraryConditionalGuardBuiltins.h"
163163

164-
#if ENABLE(STREAMS_API) || USE(CF)
164+
#if ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
165165

166166
#include "WebCoreJSClientData.h"
167167
#include <JavaScriptCore/HeapInlines.h>
@@ -200,6 +200,6 @@ WEBCORE_FOREACH_ARBITRARYCONDITIONALGUARD_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
200200

201201
} // namespace WebCore
202202

203-
#endif // ENABLE(STREAMS_API) || USE(CF)
203+
#endif // ENABLE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_A) || USE(TEST_ARBITARY_CONDTIONAL_GUARD_SEPARATE_B)
204204

205205
### End File: ArbitraryConditionalGuardBuiltins.cpp

‎Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedBuiltin-Separate.js-result‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#pragma once
3333

34-
#if ENABLE(STREAMS_API)
34+
#if ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
3535

3636
#include <JavaScriptCore/BuiltinUtils.h>
3737
#include <JavaScriptCore/Identifier.h>
@@ -124,7 +124,7 @@ inline void GuardedBuiltinBuiltinsWrapper::exportNames()
124124

125125
} // namespace WebCore
126126

127-
#endif // ENABLE(STREAMS_API)
127+
#endif // ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
128128
### End File: GuardedBuiltinBuiltins.h
129129

130130
### Begin File: GuardedBuiltinBuiltins.cpp
@@ -161,7 +161,7 @@ inline void GuardedBuiltinBuiltinsWrapper::exportNames()
161161
#include "config.h"
162162
#include "GuardedBuiltinBuiltins.h"
163163

164-
#if ENABLE(STREAMS_API)
164+
#if ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
165165

166166
#include "WebCoreJSClientData.h"
167167
#include <JavaScriptCore/HeapInlines.h>
@@ -200,6 +200,6 @@ WEBCORE_FOREACH_GUARDEDBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
200200

201201
} // namespace WebCore
202202

203-
#endif // ENABLE(STREAMS_API)
203+
#endif // ENABLE(TEST_GURDED_BUILTIN_SEPARATE)
204204

205205
### End File: GuardedBuiltinBuiltins.cpp

‎Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-GuardedInternalBuiltin-Separate.js-result‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#pragma once
3333

34-
#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
34+
#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
3535

3636
#include <JavaScriptCore/BuiltinUtils.h>
3737
#include <JavaScriptCore/Identifier.h>
@@ -156,7 +156,7 @@ inline void GuardedInternalBuiltinBuiltinFunctions::visit(JSC::SlotVisitor& visi
156156

157157
} // namespace WebCore
158158

159-
#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
159+
#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
160160
### End File: GuardedInternalBuiltinBuiltins.h
161161

162162
### Begin File: GuardedInternalBuiltinBuiltins.cpp
@@ -193,7 +193,7 @@ inline void GuardedInternalBuiltinBuiltinFunctions::visit(JSC::SlotVisitor& visi
193193
#include "config.h"
194194
#include "GuardedInternalBuiltinBuiltins.h"
195195

196-
#if ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
196+
#if ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
197197

198198
#include "WebCoreJSClientData.h"
199199
#include <JavaScriptCore/HeapInlines.h>
@@ -232,6 +232,6 @@ WEBCORE_FOREACH_GUARDEDINTERNALBUILTIN_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
232232

233233
} // namespace WebCore
234234

235-
#endif // ENABLE(READABLE_STREAM_API) || ENABLE(WRITABLE_STREAM_API)
235+
#endif // ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_A) || ENABLE(TEST_GUARDED_INTERNAL_BUILTIN_SEPARATED_B)
236236

237237
### End File: GuardedInternalBuiltinBuiltins.cpp

‎Source/JavaScriptCore/Scripts/tests/builtins/expected/WebCore-xmlCasingTest-Separate.js-result‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
#pragma once
3333

34-
#if ENABLE(STREAMS_API)
34+
#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
3535

3636
#include <JavaScriptCore/BuiltinUtils.h>
3737
#include <JavaScriptCore/Identifier.h>
@@ -172,7 +172,7 @@ inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
172172

173173
} // namespace WebCore
174174

175-
#endif // ENABLE(STREAMS_API)
175+
#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
176176
### End File: xmlCasingTestBuiltins.h
177177

178178
### Begin File: xmlCasingTestBuiltins.cpp
@@ -209,7 +209,7 @@ inline void xmlCasingTestBuiltinFunctions::visit(JSC::SlotVisitor& visitor)
209209
#include "config.h"
210210
#include "xmlCasingTestBuiltins.h"
211211

212-
#if ENABLE(STREAMS_API)
212+
#if ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
213213

214214
#include "WebCoreJSClientData.h"
215215
#include <JavaScriptCore/HeapInlines.h>
@@ -289,6 +289,6 @@ WEBCORE_FOREACH_XMLCASINGTEST_BUILTIN_CODE(DEFINE_BUILTIN_GENERATOR)
289289

290290
} // namespace WebCore
291291

292-
#endif // ENABLE(STREAMS_API)
292+
#endif // ENABLE(TEST_XML_CASTING_TEST_SEPARATE)
293293

294294
### End File: xmlCasingTestBuiltins.cpp

0 commit comments

Comments
 (0)