Skip to content

[NFC][libc++][test] Refactor new ftm generator tests. #134490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2025
Merged

[NFC][libc++][test] Refactor new ftm generator tests. #134490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 41 additions & 32 deletions libcxx/test/libcxx/feature_test_macro/ftm_metadata.sh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,48 @@
# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/test/libcxx/feature_test_macro/test_data.json

import sys
import unittest

sys.path.append(sys.argv[1])
UTILS = sys.argv[1]
TEST_DATA = sys.argv[2]
del sys.argv[1:3]

sys.path.append(UTILS)
from generate_feature_test_macro_components import FeatureTestMacros, Metadata


def test(output, expected):
assert output == expected, f"expected\n{expected}\n\noutput\n{output}"


ftm = FeatureTestMacros(sys.argv[2])

test(
ftm.ftm_metadata,
{
"__cpp_lib_any": Metadata(
headers=["any"], test_suite_guard=None, libcxx_guard=None
),
"__cpp_lib_barrier": Metadata(
headers=["barrier"],
test_suite_guard="!defined(_LIBCPP_VERSION) || (_LIBCPP_HAS_THREADS && _LIBCPP_AVAILABILITY_HAS_SYNC)",
libcxx_guard="_LIBCPP_HAS_THREADS && _LIBCPP_AVAILABILITY_HAS_SYNC",
),
"__cpp_lib_format": Metadata(
headers=["format"], test_suite_guard=None, libcxx_guard=None
),
"__cpp_lib_parallel_algorithm": Metadata(
headers=["algorithm", "numeric"], test_suite_guard=None, libcxx_guard=None
),
"__cpp_lib_variant": Metadata(
headers=["variant"], test_suite_guard=None, libcxx_guard=None
),
"__cpp_lib_missing_FTM_in_older_standard": Metadata(
headers=[], test_suite_guard=None, libcxx_guard=None
),
},
)
class Test(unittest.TestCase):
def setUp(self):
self.ftm = FeatureTestMacros(TEST_DATA)
self.maxDiff = None # This causes the diff to be printed when the test fails

def test_implementation(self):
expected = {
"__cpp_lib_any": Metadata(
headers=["any"], test_suite_guard=None, libcxx_guard=None
),
"__cpp_lib_barrier": Metadata(
headers=["barrier"],
test_suite_guard="!defined(_LIBCPP_VERSION) || (_LIBCPP_HAS_THREADS && _LIBCPP_AVAILABILITY_HAS_SYNC)",
libcxx_guard="_LIBCPP_HAS_THREADS && _LIBCPP_AVAILABILITY_HAS_SYNC",
),
"__cpp_lib_format": Metadata(
headers=["format"], test_suite_guard=None, libcxx_guard=None
),
"__cpp_lib_parallel_algorithm": Metadata(
headers=["algorithm", "numeric"],
test_suite_guard=None,
libcxx_guard=None,
),
"__cpp_lib_variant": Metadata(
headers=["variant"], test_suite_guard=None, libcxx_guard=None
),
"__cpp_lib_missing_FTM_in_older_standard": Metadata(
headers=[], test_suite_guard=None, libcxx_guard=None
),
}
self.assertEqual(self.ftm.ftm_metadata, expected)


if __name__ == "__main__":
unittest.main()
98 changes: 54 additions & 44 deletions libcxx/test/libcxx/feature_test_macro/implemented_ftms.sh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,61 @@
# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/test/libcxx/feature_test_macro/test_data.json

import sys
import unittest

sys.path.append(sys.argv[1])
UTILS = sys.argv[1]
TEST_DATA = sys.argv[2]
del sys.argv[1:3]

sys.path.append(UTILS)
from generate_feature_test_macro_components import FeatureTestMacros


def test(output, expected):
assert output == expected, f"expected\n{expected}\n\noutput\n{output}"


ftm = FeatureTestMacros(sys.argv[2])
test(
ftm.implemented_ftms,
{
"__cpp_lib_any": {
"c++17": "201606L",
"c++20": "201606L",
"c++23": "201606L",
"c++26": "201606L",
},
"__cpp_lib_barrier": {
"c++20": "201907L",
"c++23": "201907L",
"c++26": "299900L",
},
"__cpp_lib_format": {
"c++20": None,
"c++23": None,
"c++26": None,
},
"__cpp_lib_parallel_algorithm": {
"c++17": "201603L",
"c++20": "201603L",
"c++23": "201603L",
"c++26": "201603L",
},
"__cpp_lib_variant": {
"c++17": "202102L",
"c++20": "202102L",
"c++23": "202102L",
"c++26": "202102L",
},
"__cpp_lib_missing_FTM_in_older_standard": {
"c++17": None,
"c++20": None,
"c++26": None,
},
},
)
class Test(unittest.TestCase):
def setUp(self):
self.ftm = FeatureTestMacros(TEST_DATA)
self.maxDiff = None # This causes the diff to be printed when the test fails

def test_implementation(self):

expected = {
"__cpp_lib_any": {
"c++17": "201606L",
"c++20": "201606L",
"c++23": "201606L",
"c++26": "201606L",
},
"__cpp_lib_barrier": {
"c++20": "201907L",
"c++23": "201907L",
"c++26": "299900L",
},
"__cpp_lib_format": {
"c++20": None,
"c++23": None,
"c++26": None,
},
"__cpp_lib_parallel_algorithm": {
"c++17": "201603L",
"c++20": "201603L",
"c++23": "201603L",
"c++26": "201603L",
},
"__cpp_lib_variant": {
"c++17": "202102L",
"c++20": "202102L",
"c++23": "202102L",
"c++26": "202102L",
},
"__cpp_lib_missing_FTM_in_older_standard": {
"c++17": None,
"c++20": None,
"c++26": None,
},
}

self.assertEqual(self.ftm.implemented_ftms, expected)


if __name__ == "__main__":
unittest.main()
99 changes: 54 additions & 45 deletions libcxx/test/libcxx/feature_test_macro/standard_ftms.sh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,52 +9,61 @@
# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/test/libcxx/feature_test_macro/test_data.json

import sys
import unittest

sys.path.append(sys.argv[1])
UTILS = sys.argv[1]
TEST_DATA = sys.argv[2]
del sys.argv[1:3]

sys.path.append(UTILS)
from generate_feature_test_macro_components import FeatureTestMacros


def test(output, expected):
assert output == expected, f"expected\n{expected}\n\noutput\n{output}"


ftm = FeatureTestMacros(sys.argv[2])
test(
ftm.standard_ftms,
{
"__cpp_lib_any": {
"c++17": "201606L",
"c++20": "201606L",
"c++23": "201606L",
"c++26": "201606L",
},
"__cpp_lib_barrier": {
"c++20": "201907L",
"c++23": "201907L",
"c++26": "299900L",
},
"__cpp_lib_format": {
"c++20": "202110L",
"c++23": "202207L",
"c++26": "202311L",
},
"__cpp_lib_parallel_algorithm": {
"c++17": "201603L",
"c++20": "201603L",
"c++23": "201603L",
"c++26": "201603L",
},
"__cpp_lib_variant": {
"c++17": "202102L",
"c++20": "202106L",
"c++23": "202106L",
"c++26": "202306L",
},
"__cpp_lib_missing_FTM_in_older_standard": {
"c++17": "2017L",
"c++20": "2020L",
"c++23": "2020L",
"c++26": "2026L",
},
},
)
class Test(unittest.TestCase):
def setUp(self):
self.ftm = FeatureTestMacros(TEST_DATA)
self.maxDiff = None # This causes the diff to be printed when the test fails

def test_implementation(self):
expected = {
"__cpp_lib_any": {
"c++17": "201606L",
"c++20": "201606L",
"c++23": "201606L",
"c++26": "201606L",
},
"__cpp_lib_barrier": {
"c++20": "201907L",
"c++23": "201907L",
"c++26": "299900L",
},
"__cpp_lib_format": {
"c++20": "202110L",
"c++23": "202207L",
"c++26": "202311L",
},
"__cpp_lib_parallel_algorithm": {
"c++17": "201603L",
"c++20": "201603L",
"c++23": "201603L",
"c++26": "201603L",
},
"__cpp_lib_variant": {
"c++17": "202102L",
"c++20": "202106L",
"c++23": "202106L",
"c++26": "202306L",
},
"__cpp_lib_missing_FTM_in_older_standard": {
"c++17": "2017L",
"c++20": "2020L",
"c++23": "2020L",
"c++26": "2026L",
},
}

self.assertEqual(self.ftm.standard_ftms, expected)


if __name__ == "__main__":
unittest.main()
35 changes: 22 additions & 13 deletions libcxx/test/libcxx/feature_test_macro/std_dialects.sh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,31 @@
# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/test/libcxx/feature_test_macro/test_data.json

import sys
import unittest

sys.path.append(sys.argv[1])
UTILS = sys.argv[1]
TEST_DATA = sys.argv[2]
del sys.argv[1:3]

sys.path.append(UTILS)
from generate_feature_test_macro_components import FeatureTestMacros


def test(output, expected):
assert output == expected, f"expected\n{expected}\n\noutput\n{output}"
class Test(unittest.TestCase):
def setUp(self):
self.ftm = FeatureTestMacros(TEST_DATA)
self.maxDiff = None # This causes the diff to be printed when the test fails

def test_implementation(self):
expected = [
"c++17",
"c++20",
"c++23",
"c++26",
]

self.assertEqual(self.ftm.std_dialects, expected)


ftm = FeatureTestMacros(sys.argv[2])
test(
ftm.std_dialects,
[
"c++17",
"c++20",
"c++23",
"c++26",
],
)
if __name__ == "__main__":
unittest.main()
28 changes: 18 additions & 10 deletions libcxx/test/libcxx/feature_test_macro/version_header.sh.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,23 @@
# RUN: %{python} %s %{libcxx-dir}/utils %{libcxx-dir}/test/libcxx/feature_test_macro/test_data.json

import sys
import unittest

sys.path.append(sys.argv[1])
from generate_feature_test_macro_components import FeatureTestMacros
UTILS = sys.argv[1]
TEST_DATA = sys.argv[2]
del sys.argv[1:3]

sys.path.append(UTILS)
from generate_feature_test_macro_components import FeatureTestMacros

def test(output, expected):
assert output == expected, f"expected\n{expected}\n\noutput\n{output}"

class Test(unittest.TestCase):
def setUp(self):
self.ftm = FeatureTestMacros(TEST_DATA)
self.maxDiff = None # This causes the diff to be printed when the test fails

ftm = FeatureTestMacros(sys.argv[2])
test(
ftm.version_header,
"""// -*- C++ -*-
def test_implementeation(self):
expected = """// -*- C++ -*-
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
Expand Down Expand Up @@ -70,5 +74,9 @@ def test(output, expected):
#endif // _LIBCPP_STD_VER >= 26

#endif // _LIBCPP_VERSIONH
""",
)
"""
self.assertEqual(self.ftm.version_header, expected)


if __name__ == "__main__":
unittest.main()
Loading
Loading