diff options
Diffstat (limited to 'libicuuc/tests')
-rw-r--r-- | libicuuc/tests/basic/buildfile | 3 | ||||
-rw-r--r-- | libicuuc/tests/basic/driver.cpp (renamed from libicuuc/tests/basic/driver.c) | 37 | ||||
-rw-r--r-- | libicuuc/tests/basic/testscript | 1 | ||||
-rw-r--r-- | libicuuc/tests/build/bootstrap.build | 1 | ||||
-rw-r--r-- | libicuuc/tests/build/root.build | 19 | ||||
-rw-r--r-- | libicuuc/tests/buildfile | 1 |
6 files changed, 29 insertions, 33 deletions
diff --git a/libicuuc/tests/basic/buildfile b/libicuuc/tests/basic/buildfile index 6934b21..2189aa6 100644 --- a/libicuuc/tests/basic/buildfile +++ b/libicuuc/tests/basic/buildfile @@ -1,7 +1,6 @@ # file : tests/basic/buildfile -# copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC # license : Unicode License; see accompanying LICENSE file import libs = libicuuc%lib{icuuc} -exe{driver}: {h c}{*} $libs testscript +exe{driver}: {hxx cxx}{*} $libs testscript diff --git a/libicuuc/tests/basic/driver.c b/libicuuc/tests/basic/driver.cpp index 92c2b7c..a273133 100644 --- a/libicuuc/tests/basic/driver.c +++ b/libicuuc/tests/basic/driver.cpp @@ -1,7 +1,6 @@ -/* file : tests/basic/driver.c - * copyright : Copyright (c) 2009-2019 Code Synthesis Tools CC - * license : Unicode License; see accompanying LICENSE file - */ +// file : tests/basic/driver.cpp +// license : Unicode License; see accompanying LICENSE file + #include <stdio.h> #include <assert.h> @@ -11,19 +10,19 @@ #include <unicode/utypes.h> #include <unicode/uversion.h> -/* Usage: argv[0] - * - * Test some basic libicuuc functionality: - * - * - query and print the library version - * - set, query and print the default locale - * - load a portion of the bundled data and print its format id/version - */ +// Usage: argv[0] +// +// Test some basic libicuuc functionality: +// +// - query and print the library version +// - set, query and print the default locale +// - load a portion of the bundled data and print its format id/version + int main () { - /* Print version. - */ + // Print version. + // UVersionInfo v; u_getVersion (v); @@ -32,8 +31,8 @@ main () printf ("version: %s\n", s); - /* Change and print the current locale. - */ + // Change and print the current locale. + // UErrorCode e = U_ZERO_ERROR; uloc_setDefault ("en_GB", &e); @@ -47,9 +46,9 @@ main () printf ("locale: %s\n", uloc_getDefault ()); - /* Check that data is properly loaded from the libicudata's data bundle and - * print its format id/version. - */ + // Check that data is properly loaded from the libicudata's data bundle and + // print its format id/version. + // UDataMemory* d = udata_open (NULL, "res", "en_US", &e); if (U_FAILURE (e)) diff --git a/libicuuc/tests/basic/testscript b/libicuuc/tests/basic/testscript index 72fbe00..2578551 100644 --- a/libicuuc/tests/basic/testscript +++ b/libicuuc/tests/basic/testscript @@ -1,5 +1,4 @@ # file : tests/basic/testscript -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file $* >>~%EOO% diff --git a/libicuuc/tests/build/bootstrap.build b/libicuuc/tests/build/bootstrap.build index 17797c1..b689bd5 100644 --- a/libicuuc/tests/build/bootstrap.build +++ b/libicuuc/tests/build/bootstrap.build @@ -1,5 +1,4 @@ # file : tests/build/bootstrap.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file project = # Unnamed subproject. diff --git a/libicuuc/tests/build/root.build b/libicuuc/tests/build/root.build index be01522..76b5bd7 100644 --- a/libicuuc/tests/build/root.build +++ b/libicuuc/tests/build/root.build @@ -1,17 +1,18 @@ # file : tests/build/root.build -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file -using c +cxx.std = latest -h{*}: extension = h -c{*}: extension = c +using cxx -if ($c.target.system == 'win32-msvc') - c.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS +hxx{*}: extension = h +cxx{*}: extension = cpp -if ($c.class == 'msvc') - c.coptions += /wd4251 /wd4275 /wd4800 +if ($cxx.target.system == 'win32-msvc') + cxx.poptions += -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS + +if ($cxx.class == 'msvc') + cxx.coptions += /wd4251 /wd4275 /wd4800 # Every exe{} in this subproject is by default a test. # @@ -19,4 +20,4 @@ exe{*}: test = true # Specify the test target for cross-testing. # -test.target = $c.target +test.target = $cxx.target diff --git a/libicuuc/tests/buildfile b/libicuuc/tests/buildfile index d976635..78b2b2a 100644 --- a/libicuuc/tests/buildfile +++ b/libicuuc/tests/buildfile @@ -1,5 +1,4 @@ # file : tests/buildfile -# copyright : Copyright (c) 2016-2019 Code Synthesis Ltd # license : Unicode License; see accompanying LICENSE file ./: {*/ -build/} |