tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes Iaf798077,I9080838f,Ia13a8ae2,If0d81b0a,Ie493d8c3

Browse source 
am: 52848b02b3

Change-Id: Iba29e9463d82b0d5ac1298d65aeaf7f900d63ff5
This commit is contained in:
Josh Gao 2016-08-15 23:15:28 +00:00 committed by android-build-merger
commit 29114522dc
11 changed files with 155 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tools/versioner/run_tests.py
View file

@ -53,13 +53,33 @@ def run_test(test_name, path):
print("{} {}".format(prefix_pass, test_name))
return True
def usage():
print("Usage: run_tests.py [-f]")
print(" -f\t\tdon't run slow tests")
sys.exit(0)
root_dir = os.path.dirname(os.path.realpath(__file__))
test_dir = os.path.join(root_dir, "tests")
tests = os.listdir(test_dir)
run_slow = True
if len(sys.argv) > 2:
usage()
elif len(sys.argv) == 2:
if sys.argv[1] != "-f":
usage()
run_slow = False
success = True
for test in sorted(tests):
if not run_test(test, os.path.join(test_dir, test)):
if test.startswith("slow") and not run_slow:
continue
path = os.path.join(test_dir, test)
if not os.path.isdir(path):
continue
if not run_test(test, path):
success = False
sys.exit(0 if success else 1)

26
tools/versioner/src/Preprocessor.cpp
View file

@ -93,12 +93,12 @@ static DeclarationAvailability calculateRequiredGuard(const Declaration& declara
}
DeclarationAvailability result = decl_av;
if (result.global_availability.introduced < global_min_api_visible) {
if (result.global_availability.introduced <= global_min_api_visible) {
result.global_availability.introduced = 0;
}
for (Arch arch : supported_archs) {
if (result.arch_availability[arch].introduced < arch_visibility[arch]) {
if (result.arch_availability[arch].introduced <= arch_visibility[arch]) {
result.arch_availability[arch].introduced = 0;
}
}
@ -459,7 +459,7 @@ bool preprocessHeaders(const std::string& dst_dir, const std::string& src_dir,
}
}
// Copy over any unchanged files directly.
// Copy over the original headers before preprocessing.
char* fts_paths[2] = { const_cast<char*>(src_dir.c_str()), nullptr };
FTS* fts = fts_open(fts_paths, FTS_LOGICAL, nullptr);
while (FTSENT* ent = fts_read(fts)) {
@ -473,18 +473,14 @@ bool preprocessHeaders(const std::string& dst_dir, const std::string& src_dir,
}
std::string rel_path = path.substr(src_dir.length() + 1);
if (guards.count(rel_path) == 0) {
std::string dst_path = dst_dir + "/" + rel_path;
llvm::StringRef parent_path = llvm::sys::path::parent_path(dst_path);
if (llvm::sys::fs::create_directories(parent_path)) {
errx(1, "failed to ensure existence of directory '%s'", parent_path.str().c_str());
}
if (llvm::sys::fs::copy_file(path, dst_path)) {
errx(1, "failed to copy '%s/%s' to '%s'", src_dir.c_str(), path.str().c_str(),
dst_path.c_str());
}
printf("Copied unmodified header %s\n", dst_path.c_str());
std::string dst_path = dst_dir + "/" + rel_path;
llvm::StringRef parent_path = llvm::sys::path::parent_path(dst_path);
if (llvm::sys::fs::create_directories(parent_path)) {
errx(1, "failed to ensure existence of directory '%s'", parent_path.str().c_str());
}
if (llvm::sys::fs::copy_file(path, dst_path)) {
errx(1, "failed to copy '%s/%s' to '%s'", src_dir.c_str(), path.str().c_str(),
dst_path.c_str());
}
}
fts_close(fts);

1
tools/versioner/tests/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
out/

54
tools/versioner/tests/preprocessor/expected/foo.h
View file

@ -3,44 +3,64 @@ int always_available();
int also_always_available() __INTRODUCED_IN(9);
#if __ANDROID_API__ >= 10
int needs_guard() __INTRODUCED_IN(10);
#endif /* __ANDROID_API__ >= 10 */
#if __ANDROID_API__ >= 13
int needs_guard() __INTRODUCED_IN(13);
#endif /* __ANDROID_API__ >= 13 */
#if __ANDROID_API__ >= 10
int already_guarded() __INTRODUCED_IN(10);
#if __ANDROID_API__ >= 12
#if __ANDROID_API__ >= 13
int needs_guard_2() __INTRODUCED_IN(13);
#endif /* __ANDROID_API__ >= 13 */
#endif
#if __ANDROID_API__ >= 13
int already_guarded() __INTRODUCED_IN(13);
#endif
#if __ANDROID_API__ > 13
int already_guarded_2() __INTRODUCED_IN(13);
#endif
#if defined(__arm__)
#if __ANDROID_API__ >= 11
int specific_arch() __INTRODUCED_IN(11);
#endif /* __ANDROID_API__ >= 11 */
#if __ANDROID_API__ >= 14
int specific_arch() __INTRODUCED_IN(14);
#endif /* __ANDROID_API__ >= 14 */
#if __ANDROID_API__ >= 14
int specific_arch_already_guarded() __INTRODUCED_IN(14);
#endif
#if __ANDROID_API__ > 14
int specific_arch_already_guarded_2() __INTRODUCED_IN(14);
#endif
#endif
#if defined(__arm__) || defined(__i386__)
#if __ANDROID_API__ >= 11
int multiple_archs() __INTRODUCED_IN(11);
#endif /* __ANDROID_API__ >= 11 */
#if __ANDROID_API__ >= 14
int multiple_archs() __INTRODUCED_IN(14);
#endif /* __ANDROID_API__ >= 14 */
#endif
// __INTRODUCED_IN_64(21) should be ignored.
#if (defined(__LP64__)) || (defined(__arm__) && __ANDROID_API__ >= 10) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 11) || (defined(__i386__) && __ANDROID_API__ >= 10)
int multiple_introduced_1() __INTRODUCED_IN_ARM(10) __INTRODUCED_IN_MIPS(11) __INTRODUCED_IN_X86(10)
#if (defined(__LP64__)) || (defined(__arm__) && __ANDROID_API__ >= 13) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 14) || (defined(__i386__) && __ANDROID_API__ >= 13)
int multiple_introduced_1() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __INTRODUCED_IN_X86(13)
__INTRODUCED_IN_64(21);
#endif /* (defined(__LP64__)) || (defined(__arm__) && __ANDROID_API__ >= 10) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 11) || (defined(__i386__) && __ANDROID_API__ >= 10) */
#endif /* (defined(__LP64__)) || (defined(__arm__) && __ANDROID_API__ >= 13) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 14) || (defined(__i386__) && __ANDROID_API__ >= 13) */
#if (defined(__LP64__) && __ANDROID_API__ >= 22) || (defined(__arm__) && __ANDROID_API__ >= 10) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 11) || (defined(__i386__) && __ANDROID_API__ >= 10)
int multiple_introduced_2() __INTRODUCED_IN_ARM(10) __INTRODUCED_IN_MIPS(11) __INTRODUCED_IN_X86(10)
#if (defined(__LP64__) && __ANDROID_API__ >= 22) || (defined(__arm__) && __ANDROID_API__ >= 13) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 14) || (defined(__i386__) && __ANDROID_API__ >= 13)
int multiple_introduced_2() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __INTRODUCED_IN_X86(13)
__INTRODUCED_IN_64(22);
#endif /* (defined(__LP64__) && __ANDROID_API__ >= 22) || (defined(__arm__) && __ANDROID_API__ >= 10) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 11) || (defined(__i386__) && __ANDROID_API__ >= 10) */
#endif /* (defined(__LP64__) && __ANDROID_API__ >= 22) || (defined(__arm__) && __ANDROID_API__ >= 13) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 14) || (defined(__i386__) && __ANDROID_API__ >= 13) */

30
tools/versioner/tests/preprocessor/headers/foo.h
View file

@ -2,25 +2,41 @@ int always_available();
int also_always_available() __INTRODUCED_IN(9);
int needs_guard() __INTRODUCED_IN(10);
int needs_guard() __INTRODUCED_IN(13);
#if __ANDROID_API__ >= 10
int already_guarded() __INTRODUCED_IN(10);
#if __ANDROID_API__ >= 12
int needs_guard_2() __INTRODUCED_IN(13);
#endif
#if __ANDROID_API__ >= 13
int already_guarded() __INTRODUCED_IN(13);
#endif
#if __ANDROID_API__ > 13
int already_guarded_2() __INTRODUCED_IN(13);
#endif
#if defined(__arm__)
int specific_arch() __INTRODUCED_IN(11);
int specific_arch() __INTRODUCED_IN(14);
#if __ANDROID_API__ >= 14
int specific_arch_already_guarded() __INTRODUCED_IN(14);
#endif
#if __ANDROID_API__ > 14
int specific_arch_already_guarded_2() __INTRODUCED_IN(14);
#endif
#endif
#if defined(__arm__) || defined(__i386__)
int multiple_archs() __INTRODUCED_IN(11);
int multiple_archs() __INTRODUCED_IN(14);
#endif
// __INTRODUCED_IN_64(21) should be ignored.
int multiple_introduced_1() __INTRODUCED_IN_ARM(10) __INTRODUCED_IN_MIPS(11) __INTRODUCED_IN_X86(10)
int multiple_introduced_1() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __INTRODUCED_IN_X86(13)
__INTRODUCED_IN_64(21);
int multiple_introduced_2() __INTRODUCED_IN_ARM(10) __INTRODUCED_IN_MIPS(11) __INTRODUCED_IN_X86(10)
int multiple_introduced_2() __INTRODUCED_IN_ARM(13) __INTRODUCED_IN_MIPS(14) __INTRODUCED_IN_X86(13)
__INTRODUCED_IN_64(22);
int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12) __INTRODUCED_IN_MIPS(12);

50
tools/versioner/tests/preprocessor/out/foo.h
View file

@ -1,50 +0,0 @@
int always_available();
int also_always_available() __INTRODUCED_IN(9);
#if __ANDROID_API__ >= 10
int needs_guard() __INTRODUCED_IN(10);
#endif /* __ANDROID_API__ >= 10 */
#if __ANDROID_API__ >= 10
int already_guarded() __INTRODUCED_IN(10);
#endif
#if defined(__arm__)
#if __ANDROID_API__ >= 11
int specific_arch() __INTRODUCED_IN(11);
#endif /* __ANDROID_API__ >= 11 */
#endif
#if defined(__arm__) || defined(__i386__)
#if __ANDROID_API__ >= 11
int multiple_archs() __INTRODUCED_IN(11);
#endif /* __ANDROID_API__ >= 11 */
#endif
// __INTRODUCED_IN_64(21) should be ignored.
#if (defined(__LP64__)) || (defined(__arm__) && __ANDROID_API__ >= 10) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 11) || (defined(__i386__) && __ANDROID_API__ >= 10)
int multiple_introduced_1() __INTRODUCED_IN_ARM(10) __INTRODUCED_IN_MIPS(11) __INTRODUCED_IN_X86(10)
__INTRODUCED_IN_64(21);
#endif /* (defined(__LP64__)) || (defined(__arm__) && __ANDROID_API__ >= 10) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 11) || (defined(__i386__) && __ANDROID_API__ >= 10) */
#if (defined(__LP64__) && __ANDROID_API__ >= 22) || (defined(__arm__) && __ANDROID_API__ >= 10) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 11) || (defined(__i386__) && __ANDROID_API__ >= 10)
int multiple_introduced_2() __INTRODUCED_IN_ARM(10) __INTRODUCED_IN_MIPS(11) __INTRODUCED_IN_X86(10)
__INTRODUCED_IN_64(22);
#endif /* (defined(__LP64__) && __ANDROID_API__ >= 22) || (defined(__arm__) && __ANDROID_API__ >= 10) || (defined(__mips__) && !defined(__LP64__) && __ANDROID_API__ >= 11) || (defined(__i386__) && __ANDROID_API__ >= 10) */
#if (!defined(__LP64__) && __ANDROID_API__ >= 12) || (defined(__LP64__))
int group_lp32() __INTRODUCED_IN_ARM(12) __INTRODUCED_IN_X86(12) __INTRODUCED_IN_MIPS(12);
#endif /* (!defined(__LP64__) && __ANDROID_API__ >= 12) || (defined(__LP64__)) */

31
tools/versioner/tests/preprocessor/run.sh
View file

@ -1,4 +1,29 @@
rm -rf out
set -e
versioner headers -i -o out
diff -q -w -B out expected
function run_test {
SRC=$1
DST=$2
rm -rf $2
versioner $1 -i -o $2
diff -q -w -B $2 expected
}
run_test headers out
run_test headers/ out
run_test headers out/
run_test headers/ out/
run_test `pwd`/headers out
run_test `pwd`/headers/ out
run_test `pwd`/headers out/
run_test `pwd`/headers/ out/
run_test headers `pwd`/out
run_test headers/ `pwd`/out
run_test headers `pwd`/out/
run_test headers/ `pwd`/out/
run_test `pwd`/headers `pwd`/out
run_test `pwd`/headers/ `pwd`/out
run_test `pwd`/headers `pwd`/out/
run_test `pwd`/headers/ `pwd`/out/

12
tools/versioner/tests/preprocessor_idempotence/expected/foo.h Normal file
View file

@ -0,0 +1,12 @@
#if __ANDROID_API__ >= 10
int foo() __INTRODUCED_IN(10);
#endif
#if __ANDROID_API__ >= 21
int bar(int) __INTRODUCED_IN(21);
#endif
#if __ANDROID_API__ >= 10
int multiple_1() __INTRODUCED_IN(10);
int multiple_2() __INTRODUCED_IN(10);
#endif

12
tools/versioner/tests/preprocessor_idempotence/headers/foo.h Normal file
View file

@ -0,0 +1,12 @@
#if __ANDROID_API__ >= 10
int foo() __INTRODUCED_IN(10);
#endif
#if __ANDROID_API__ >= 21
int bar(int) __INTRODUCED_IN(21);
#endif
#if __ANDROID_API__ >= 10
int multiple_1() __INTRODUCED_IN(10);
int multiple_2() __INTRODUCED_IN(10);
#endif

4
tools/versioner/tests/preprocessor_idempotence/run.sh Normal file
View file

@ -0,0 +1,4 @@
rm -rf out
set -e
versioner headers -i -o out
diff -q -w -B out expected

6
tools/versioner/tests/slow_preprocessor_idempotence/run.sh Normal file
View file

@ -0,0 +1,6 @@
rm -rf out
set -e
mkdir out
versioner -o out/initial
versioner out/initial ../../dependencies -o out/second
diff -qrwB out/initial out/second