Skip to content

Commit 45a78e4

Browse files
authored
Merge pull request #32030 from rintaro/ide-completion-rdar62923248
[CodeCompletion] Fix non-determinisc failures in dependency check test cases
2 parents e40e86f + ad51f4f commit 45a78e4

File tree

4 files changed

+4
-8
lines changed

4 files changed

+4
-8
lines changed

test/SourceKit/CodeComplete/complete_checkdeps_bridged.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ func foo() {
55
/*HERE*/
66
}
77

8-
// REQUIRES: rdar62923248
98
// REQUIRES: shell
109

1110
// RUN: %empty-directory(%t/Frameworks)
@@ -36,8 +35,8 @@ func foo() {
3635
// RUN: -req=complete -pos=5:3 %s -- ${COMPILER_ARGS[@]} == \
3736

3837
// RUN: -shell -- echo '### Modify bridging header library file' == \
39-
// RUN: -shell -- cp -R $INPUT_DIR/MyProject_mod/LocalCFunc.h %t/MyProject/ == \
4038
// RUN: -shell -- sleep $SLEEP_TIME == \
39+
// RUN: -shell -- cp -R $INPUT_DIR/MyProject_mod/LocalCFunc.h %t/MyProject/ == \
4140
// RUN: -req=complete -pos=5:3 %s -- ${COMPILER_ARGS[@]} == \
4241

4342
// RUN: -shell -- echo '### Fast completion' == \

test/SourceKit/CodeComplete/complete_checkdeps_clangmodule.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ func foo() {
55
/*HERE*/
66
}
77

8-
// REQUIRES: rdar62923248
98
// REQUIRES: shell
109

1110
// RUN: %empty-directory(%t/Frameworks)
@@ -36,8 +35,8 @@ func foo() {
3635
// RUN: -req=complete -pos=5:3 %s -- ${COMPILER_ARGS[@]} == \
3736

3837
// RUN: -shell -- echo '### Modify framework (c)' == \
39-
// RUN: -shell -- cp -R $INPUT_DIR/ClangFW.framework_mod/* %t/Frameworks/ClangFW.framework/ == \
4038
// RUN: -shell -- sleep $SLEEP_TIME == \
39+
// RUN: -shell -- cp -R $INPUT_DIR/ClangFW.framework_mod/* %t/Frameworks/ClangFW.framework/ == \
4140
// RUN: -req=complete -pos=5:3 %s -- ${COMPILER_ARGS[@]} == \
4241

4342
// RUN: -shell -- echo '### Fast completion' == \

test/SourceKit/CodeComplete/complete_checkdeps_otherfile.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ func foo() {
55
/*HERE*/
66
}
77

8-
// REQUIRES: rdar62923248
98
// REQUIRES: shell
109

1110
// RUN: %empty-directory(%t/Frameworks)
@@ -36,8 +35,8 @@ func foo() {
3635
// RUN: -req=complete -pos=5:3 %s -- ${COMPILER_ARGS[@]} == \
3736

3837
// RUN: -shell -- echo "### Modify local library file" == \
39-
// RUN: -shell -- cp -R $INPUT_DIR/MyProject_mod/Library.swift %t/MyProject/ == \
4038
// RUN: -shell -- sleep $SLEEP_TIME == \
39+
// RUN: -shell -- cp -R $INPUT_DIR/MyProject_mod/Library.swift %t/MyProject/ == \
4140
// RUN: -req=complete -pos=5:3 %s -- ${COMPILER_ARGS[@]} == \
4241

4342
// RUN: -shell -- echo '### Fast completion' == \

test/SourceKit/CodeComplete/complete_checkdeps_swiftmodule.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ func foo() {
55
/*HERE*/
66
}
77

8-
// REQUIRES: rdar62923248
98
// REQUIRES: shell
109

1110
// RUN: %empty-directory(%t/Frameworks)
@@ -36,8 +35,8 @@ func foo() {
3635
// RUN: -req=complete -pos=5:3 %s -- ${COMPILER_ARGS[@]} == \
3736

3837
// RUN: -shell -- echo '### Modify framework (s)' == \
39-
// RUN: -shell -- %target-swift-frontend -emit-module -module-name SwiftFW -o %t/Frameworks/SwiftFW.framework/Modules/SwiftFW.swiftmodule/%target-swiftmodule-name $INPUT_DIR/SwiftFW_src_mod/Funcs.swift == \
4038
// RUN: -shell -- sleep $SLEEP_TIME == \
39+
// RUN: -shell -- %target-swift-frontend -emit-module -module-name SwiftFW -o %t/Frameworks/SwiftFW.framework/Modules/SwiftFW.swiftmodule/%target-swiftmodule-name $INPUT_DIR/SwiftFW_src_mod/Funcs.swift == \
4140
// RUN: -req=complete -pos=5:3 %s -- ${COMPILER_ARGS[@]} == \
4241

4342
// RUN: -shell -- echo '### Fast completion' == \

0 commit comments

Comments
 (0)