[cmake] Add testair to the build system

https://bugs.webkit.org/show_bug.cgi?id=153126

Reviewed by Michael Catanzaro.

Source/JavaScriptCore:

* shell/CMakeLists.txt:

Tools:

* Scripts/build-jsc:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@195232 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 4dfb433..a16429b 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2016-01-18  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Add testair to the build system
+        https://bugs.webkit.org/show_bug.cgi?id=153126
+
+        Reviewed by Michael Catanzaro.
+
+        * shell/CMakeLists.txt:
+
 2016-01-17  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
 
         Ensure that CF_AVAILABLE is undefined when building webkit-gtk

diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt
index 3adf8ef..633ce42 100644 (file)
--- a/Source/JavaScriptCore/shell/CMakeLists.txt
+++ b/Source/JavaScriptCore/shell/CMakeLists.txt
@@ -46,6 +46,14 @@ if (NOT WIN32)
         ../b3/testb3.cpp
     )
 
+    set(TESTAIR_SOURCES
+        ../b3/air/testair.cpp
+    )
+
     add_executable(testb3 ${TESTB3_SOURCES})
     target_link_libraries(testb3 ${JSC_LIBRARIES})
+
+    add_executable(testair ${TESTAIR_SOURCES})
+    target_link_libraries(testair ${JSC_LIBRARIES})
+
 endif ()

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f088b57..eb7af72 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,12 @@
+2016-01-18  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [cmake] Add testair to the build system
+        https://bugs.webkit.org/show_bug.cgi?id=153126
+
+        Reviewed by Michael Catanzaro.
+
+        * Scripts/build-jsc:
+
 2016-01-16  Myles C. Maxfield  <mmaxfield@apple.com>
 
         Remove TextRun::allowsRoundingHacks()

diff --git a/Tools/Scripts/build-jsc b/Tools/Scripts/build-jsc
index 7d3b800..8717091 100755 (executable)
--- a/Tools/Scripts/build-jsc
+++ b/Tools/Scripts/build-jsc
@@ -106,7 +106,7 @@ if (isCMakeBuild()) {
     unless (isAnyWindows()) {
         # By default we build using all of the available CPUs
         $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
-        $buildTarget = "jsc testb3 $makeArgs";
+        $buildTarget = "jsc testb3 testair $makeArgs";
     } elsif (canUseNinja()) {
         $buildTarget .= "jsc testapi";
     }