r274560 - test: Use add_lit_testsuites so that subsets of tests can be specified

Justin Bogner via cfe-commits cfe-commits at lists.llvm.org
Tue Jul 5 09:06:13 PDT 2016


Author: bogner
Date: Tue Jul  5 11:06:12 2016
New Revision: 274560

URL: http://llvm.org/viewvc/llvm-project?rev=274560&view=rev
Log:
test: Use add_lit_testsuites so that subsets of tests can be specified

This creates make/ninja targets like check-clang-codegen and
check-clang-unit, much like LLVM already has. I had to move some input
files into Input directories so they weren't picked up as test
directories.

Added:
    cfe/trunk/test/ARCMT/Inputs/with space/
    cfe/trunk/test/ARCMT/Inputs/with space/test.h
      - copied, changed from r274559, cfe/trunk/test/ARCMT/with space/test.h
    cfe/trunk/test/ARCMT/Inputs/with space/test.h.result
      - copied, changed from r274559, cfe/trunk/test/ARCMT/with space/test.h.result
    cfe/trunk/test/ARCMT/Inputs/with space/test1.m.in
      - copied, changed from r274559, cfe/trunk/test/ARCMT/with space/test1.m.in
    cfe/trunk/test/ARCMT/Inputs/with space/test1.m.in.result
      - copied, changed from r274559, cfe/trunk/test/ARCMT/with space/test1.m.in.result
    cfe/trunk/test/ARCMT/Inputs/with space/test2.m.in
      - copied, changed from r274559, cfe/trunk/test/ARCMT/with space/test2.m.in
    cfe/trunk/test/ARCMT/Inputs/with space/test2.m.in.result
      - copied, changed from r274559, cfe/trunk/test/ARCMT/with space/test2.m.in.result
    cfe/trunk/test/PCH/Inputs/libroot/
    cfe/trunk/test/PCH/Inputs/libroot/usr/
    cfe/trunk/test/PCH/Inputs/libroot/usr/include/
    cfe/trunk/test/PCH/Inputs/libroot/usr/include/reloc.h
      - copied, changed from r274559, cfe/trunk/test/PCH/libroot/usr/include/reloc.h
    cfe/trunk/test/PCH/Inputs/libroot/usr/include/reloc2.h
      - copied, changed from r274559, cfe/trunk/test/PCH/libroot/usr/include/reloc2.h
Removed:
    cfe/trunk/test/ARCMT/with space/test.h
    cfe/trunk/test/ARCMT/with space/test.h.result
    cfe/trunk/test/ARCMT/with space/test1.m.in
    cfe/trunk/test/ARCMT/with space/test1.m.in.result
    cfe/trunk/test/ARCMT/with space/test2.m.in
    cfe/trunk/test/ARCMT/with space/test2.m.in.result
    cfe/trunk/test/PCH/libroot/usr/include/reloc.h
    cfe/trunk/test/PCH/libroot/usr/include/reloc2.h
Modified:
    cfe/trunk/test/ARCMT/migrate-space-in-path.m
    cfe/trunk/test/CMakeLists.txt
    cfe/trunk/test/PCH/reloc.c

Copied: cfe/trunk/test/ARCMT/Inputs/with space/test.h (from r274559, cfe/trunk/test/ARCMT/with space/test.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/Inputs/with%20space/test.h?p2=cfe/trunk/test/ARCMT/Inputs/with%20space/test.h&p1=cfe/trunk/test/ARCMT/with%20space/test.h&r1=274559&r2=274560&rev=274560&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/ARCMT/Inputs/with space/test.h.result (from r274559, cfe/trunk/test/ARCMT/with space/test.h.result)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/Inputs/with%20space/test.h.result?p2=cfe/trunk/test/ARCMT/Inputs/with%20space/test.h.result&p1=cfe/trunk/test/ARCMT/with%20space/test.h.result&r1=274559&r2=274560&rev=274560&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/ARCMT/Inputs/with space/test1.m.in (from r274559, cfe/trunk/test/ARCMT/with space/test1.m.in)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/Inputs/with%20space/test1.m.in?p2=cfe/trunk/test/ARCMT/Inputs/with%20space/test1.m.in&p1=cfe/trunk/test/ARCMT/with%20space/test1.m.in&r1=274559&r2=274560&rev=274560&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/ARCMT/Inputs/with space/test1.m.in.result (from r274559, cfe/trunk/test/ARCMT/with space/test1.m.in.result)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/Inputs/with%20space/test1.m.in.result?p2=cfe/trunk/test/ARCMT/Inputs/with%20space/test1.m.in.result&p1=cfe/trunk/test/ARCMT/with%20space/test1.m.in.result&r1=274559&r2=274560&rev=274560&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/ARCMT/Inputs/with space/test2.m.in (from r274559, cfe/trunk/test/ARCMT/with space/test2.m.in)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/Inputs/with%20space/test2.m.in?p2=cfe/trunk/test/ARCMT/Inputs/with%20space/test2.m.in&p1=cfe/trunk/test/ARCMT/with%20space/test2.m.in&r1=274559&r2=274560&rev=274560&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/ARCMT/Inputs/with space/test2.m.in.result (from r274559, cfe/trunk/test/ARCMT/with space/test2.m.in.result)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/Inputs/with%20space/test2.m.in.result?p2=cfe/trunk/test/ARCMT/Inputs/with%20space/test2.m.in.result&p1=cfe/trunk/test/ARCMT/with%20space/test2.m.in.result&r1=274559&r2=274560&rev=274560&view=diff
==============================================================================
    (empty)

Modified: cfe/trunk/test/ARCMT/migrate-space-in-path.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/migrate-space-in-path.m?rev=274560&r1=274559&r2=274560&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/migrate-space-in-path.m (original)
+++ cfe/trunk/test/ARCMT/migrate-space-in-path.m Tue Jul  5 11:06:12 2016
@@ -1,5 +1,5 @@
 // RUN: rm -rf %t.migrate
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/"with space"/test1.m.in -x objective-c 
-// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/"with space"/test2.m.in -x objective-c 
-// RUN: c-arcmt-test -mt-migrate-directory %t.migrate | arcmt-test -verify-transformed-files %S/"with space"/test1.m.in.result %S/"with space"/test2.m.in.result %S/"with space"/test.h.result
+// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/Inputs/"with space"/test1.m.in -x objective-c
+// RUN: %clang_cc1 -arcmt-migrate -mt-migrate-directory %t.migrate %S/Inputs/"with space"/test2.m.in -x objective-c
+// RUN: c-arcmt-test -mt-migrate-directory %t.migrate | arcmt-test -verify-transformed-files %S/Inputs/"with space"/test1.m.in.result %S/Inputs/"with space"/test2.m.in.result %S/Inputs/"with space"/test.h.result
 // RUN: rm -rf %t.migrate

Removed: cfe/trunk/test/ARCMT/with space/test.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/with%20space/test.h?rev=274559&view=auto
==============================================================================
--- cfe/trunk/test/ARCMT/with space/test.h (original)
+++ cfe/trunk/test/ARCMT/with space/test.h (removed)
@@ -1,15 +0,0 @@
- at protocol NSObject
-- (oneway void)release;
- at end
-
-#ifdef PART1
-static inline void part1(id p) {
-  [p release];
-}
-#endif
-
-#ifdef PART2
-static inline void part2(id p) {
-  [p release];
-}
-#endif

Removed: cfe/trunk/test/ARCMT/with space/test.h.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/with%20space/test.h.result?rev=274559&view=auto
==============================================================================
--- cfe/trunk/test/ARCMT/with space/test.h.result (original)
+++ cfe/trunk/test/ARCMT/with space/test.h.result (removed)
@@ -1,13 +0,0 @@
- at protocol NSObject
-- (oneway void)release;
- at end
-
-#ifdef PART1
-static inline void part1(id p) {
-}
-#endif
-
-#ifdef PART2
-static inline void part2(id p) {
-}
-#endif

Removed: cfe/trunk/test/ARCMT/with space/test1.m.in
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/with%20space/test1.m.in?rev=274559&view=auto
==============================================================================
--- cfe/trunk/test/ARCMT/with space/test1.m.in (original)
+++ cfe/trunk/test/ARCMT/with space/test1.m.in (removed)
@@ -1,6 +0,0 @@
-#define PART1
-#include "test.h"
-
-void test1(id p) {
-  [p release];
-}

Removed: cfe/trunk/test/ARCMT/with space/test1.m.in.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/with%20space/test1.m.in.result?rev=274559&view=auto
==============================================================================
--- cfe/trunk/test/ARCMT/with space/test1.m.in.result (original)
+++ cfe/trunk/test/ARCMT/with space/test1.m.in.result (removed)
@@ -1,5 +0,0 @@
-#define PART1
-#include "test.h"
-
-void test1(id p) {
-}

Removed: cfe/trunk/test/ARCMT/with space/test2.m.in
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/with%20space/test2.m.in?rev=274559&view=auto
==============================================================================
--- cfe/trunk/test/ARCMT/with space/test2.m.in (original)
+++ cfe/trunk/test/ARCMT/with space/test2.m.in (removed)
@@ -1,6 +0,0 @@
-#define PART2
-#include "test.h"
-
-void test2(id p) {
-  [p release];
-}

Removed: cfe/trunk/test/ARCMT/with space/test2.m.in.result
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/with%20space/test2.m.in.result?rev=274559&view=auto
==============================================================================
--- cfe/trunk/test/ARCMT/with space/test2.m.in.result (original)
+++ cfe/trunk/test/ARCMT/with space/test2.m.in.result (removed)
@@ -1,5 +0,0 @@
-#define PART2
-#include "test.h"
-
-void test2(id p) {
-}

Modified: cfe/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CMakeLists.txt?rev=274560&r1=274559&r2=274560&view=diff
==============================================================================
--- cfe/trunk/test/CMakeLists.txt (original)
+++ cfe/trunk/test/CMakeLists.txt Tue Jul  5 11:06:12 2016
@@ -93,6 +93,11 @@ add_lit_testsuite(check-clang "Running t
   )
 set_target_properties(check-clang PROPERTIES FOLDER "Clang tests")
 
+add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR}
+  PARAMS ${CLANG_TEST_PARAMS}
+  DEPENDS ${CLANG_TEST_DEPS}
+)
+
 # Add a legacy target spelling: clang-test
 add_custom_target(clang-test)
 add_dependencies(clang-test check-clang)

Copied: cfe/trunk/test/PCH/Inputs/libroot/usr/include/reloc.h (from r274559, cfe/trunk/test/PCH/libroot/usr/include/reloc.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/libroot/usr/include/reloc.h?p2=cfe/trunk/test/PCH/Inputs/libroot/usr/include/reloc.h&p1=cfe/trunk/test/PCH/libroot/usr/include/reloc.h&r1=274559&r2=274560&rev=274560&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/PCH/Inputs/libroot/usr/include/reloc2.h (from r274559, cfe/trunk/test/PCH/libroot/usr/include/reloc2.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/Inputs/libroot/usr/include/reloc2.h?p2=cfe/trunk/test/PCH/Inputs/libroot/usr/include/reloc2.h&p1=cfe/trunk/test/PCH/libroot/usr/include/reloc2.h&r1=274559&r2=274560&rev=274560&view=diff
==============================================================================
    (empty)

Removed: cfe/trunk/test/PCH/libroot/usr/include/reloc.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/libroot/usr/include/reloc.h?rev=274559&view=auto
==============================================================================
--- cfe/trunk/test/PCH/libroot/usr/include/reloc.h (original)
+++ cfe/trunk/test/PCH/libroot/usr/include/reloc.h (removed)
@@ -1,15 +0,0 @@
-#ifndef RELOC_H
-#define RELOC_H
-
-#include <reloc2.h>
-
-
-
-
-
-
-
-// Line number 13 below is important
-int x = 2;
-
-#endif // RELOC_H

Removed: cfe/trunk/test/PCH/libroot/usr/include/reloc2.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/libroot/usr/include/reloc2.h?rev=274559&view=auto
==============================================================================
--- cfe/trunk/test/PCH/libroot/usr/include/reloc2.h (original)
+++ cfe/trunk/test/PCH/libroot/usr/include/reloc2.h (removed)
@@ -1,15 +0,0 @@
-#ifndef RELOC2_H
-#define RELOC2_H
-#include <stddef.h>
-
-
-
-
-
-
-
-
-
-// Line number below is important!
-int y = 2;
-#endif // RELOC2_H

Modified: cfe/trunk/test/PCH/reloc.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/PCH/reloc.c?rev=274560&r1=274559&r2=274560&view=diff
==============================================================================
--- cfe/trunk/test/PCH/reloc.c (original)
+++ cfe/trunk/test/PCH/reloc.c Tue Jul  5 11:06:12 2016
@@ -1,7 +1,7 @@
 // RUN: %clang -target x86_64-apple-darwin10 --relocatable-pch -o %t \
-// RUN:   -isysroot %S/libroot %S/libroot/usr/include/reloc.h
+// RUN:   -isysroot %S/Inputs/libroot %S/Inputs/libroot/usr/include/reloc.h
 // RUN: %clang -target x86_64-apple-darwin10 -fsyntax-only \
-// RUN:   -include-pch %t -isysroot %S/libroot %s -Xclang -verify
+// RUN:   -include-pch %t -isysroot %S/Inputs/libroot %s -Xclang -verify
 // RUN: not %clang -target x86_64-apple-darwin10 -include-pch %t %s
 // REQUIRES: x86-registered-target
 
@@ -11,5 +11,5 @@ int x = 2; // expected-error{{redefiniti
 int y = 5; // expected-error{{redefinition}}
 
 
-// expected-note at libroot/usr/include/reloc.h:13{{previous definition}}
-// expected-note at libroot/usr/include/reloc2.h:14{{previous definition}}
+// expected-note at Inputs/libroot/usr/include/reloc.h:13{{previous definition}}
+// expected-note at Inputs/libroot/usr/include/reloc2.h:14{{previous definition}}




More information about the cfe-commits mailing list