diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2016-07-14 12:56:21 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2016-07-14 12:56:21 +0000 |
| commit | 69c476ccd2fdb25c1fd3afaa63d465a624ed5c02 (patch) | |
| tree | 0f64fa2a066888ae947a0b2d4efb6880c2d65f94 | |
| parent | 745e7527254611c2bb031b53fc4981910193baba (diff) | |
| download | bcm5719-llvm-69c476ccd2fdb25c1fd3afaa63d465a624ed5c02.tar.gz bcm5719-llvm-69c476ccd2fdb25c1fd3afaa63d465a624ed5c02.zip | |
[OpenCL] Actually activate Frontend/opencl.cl test and fix test bugs
rL275318 added the test Frontend/opencl.cl test, but that test was never actually run because Frontend/lit.local.cfg doesn't contain the '.cl' file suffix.
Once the test is activated, it fails with (unintended) compile errors in the newly added CHECK_INVALID_OPENCL_VERSION checks.
This patch adds the '.cl' file suffix to Frontend/lit.local.cfg to activate the test and fixes the test bug by adding '-fblocks' to the relevant command lines.
Patch by Martin Böhme!
Differential Revision: http://reviews.llvm.org/D22349
llvm-svn: 275405
| -rw-r--r-- | clang/test/Frontend/lit.local.cfg | 2 | ||||
| -rw-r--r-- | clang/test/Frontend/opencl.cl | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/test/Frontend/lit.local.cfg b/clang/test/Frontend/lit.local.cfg index c11fb6d611a..7a05c5dfd25 100644 --- a/clang/test/Frontend/lit.local.cfg +++ b/clang/test/Frontend/lit.local.cfg @@ -1 +1 @@ -config.suffixes = ['.c', '.cpp', '.m', '.mm', '.ll'] +config.suffixes = ['.c', '.cpp', '.m', '.mm', '.ll', '.cl'] diff --git a/clang/test/Frontend/opencl.cl b/clang/test/Frontend/opencl.cl index b0ff6967e12..95b5f147162 100644 --- a/clang/test/Frontend/opencl.cl +++ b/clang/test/Frontend/opencl.cl @@ -6,8 +6,8 @@ // RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.1 -fblocks -DBLOCKS // RUN: %clang_cc1 %s -verify -fsyntax-only -cl-std=CL1.2 -fblocks -DBLOCKS // RUN: %clang_cc1 %s -triple amdgcn--amdhsa -x c -std=c99 -verify -fsyntax-only -// RUN: %clang_cc1 -cl-std=CL1.1 -cl-strict-aliasing %s 2>&1 | FileCheck --check-prefix=CHECK-INVALID-OPENCL-VERSION11 %s -// RUN: %clang_cc1 -cl-std=CL1.2 -cl-strict-aliasing %s 2>&1 | FileCheck --check-prefix=CHECK-INVALID-OPENCL-VERSION12 %s +// RUN: %clang_cc1 -cl-std=CL1.1 -cl-strict-aliasing -fblocks %s 2>&1 | FileCheck --check-prefix=CHECK-INVALID-OPENCL-VERSION11 %s +// RUN: %clang_cc1 -cl-std=CL1.2 -cl-strict-aliasing -fblocks %s 2>&1 | FileCheck --check-prefix=CHECK-INVALID-OPENCL-VERSION12 %s // RUN: %clang_cc1 -cl-std=CL2.0 -cl-strict-aliasing %s 2>&1 | FileCheck --check-prefix=CHECK-INVALID-OPENCL-VERSION20 %s void f(void (^g)(void)) { @@ -24,4 +24,4 @@ void f(void (^g)(void)) { // CHECK-INVALID-OPENCL-VERSION11: warning: OpenCL version 1.1 does not support the option '-cl-strict-aliasing' // CHECK-INVALID-OPENCL-VERSION12: warning: OpenCL version 1.2 does not support the option '-cl-strict-aliasing' -// CHECK-INVALID-OPENCL-VERSION20: warning: OpenCL version 2.0 does not support the option '-cl-strict-aliasing'
\ No newline at end of file +// CHECK-INVALID-OPENCL-VERSION20: warning: OpenCL version 2.0 does not support the option '-cl-strict-aliasing' |
