diff --git a/.copr/Makefile b/.copr/Makefile deleted file mode 100644 index 4d3b5f8..0000000 --- a/.copr/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# See https://docs.pagure.org/copr.copr/user_documentation.html#make-srpm -# See for the --setopt option in the enabling of copr repo see: -# https://pagure.io/copr/copr/issue/184 - -COPR_USERNAME=$(shell rpm --eval %copr_username) -COPR_PROJECT=$(shell rpm --eval %copr_projectname) -YYYYMMDD=$(shell date +%Y%m%d) - -required_packages=git tar xz curl fedpkg rpmautospec -outdir?=$(shell pwd) -spec?=llvm-test-suite.spec - -.PHONY: srpm -srpm: - @echo "Check for required packages needed by snapshot-info.sh: $(required_packages)" - rpm -q $(required_packages) || dnf install -y $(required_packages) --setopt=install_weak_deps=False - - @echo "Fetch information about today's snapshot" - YYYYMMDD=$(YYYYMMDD) ./.copr/snapshot-info.sh > version.spec.inc - - @echo "Test that we wanna build a snapshot today by parsing the versions.spec.inc" - rpm --eval="$$(cat version.spec.inc)" - - @echo "Remove left-over llvm-test-suite tarball and signature" - rm -vf $(shell pwd)/llvm-test-suite-*.tar.xz* - - @echo "Prepare sources" - SNAPSHOT_BUILD=1 ./pkg_test_suite.sh - - @echo "Preprocess for rpmautospec" - rpmautospec process-distgit $(spec) $(spec) - - @echo "Finally build SRPM" - rpmbuild \ - --with=snapshot_build \ - --define "_srcrpmdir $(outdir)" \ - --define "_sourcedir $(shell pwd)" \ - --define "_disable_source_fetch 0" \ - -bs $(spec) diff --git a/.copr/snapshot-info.sh b/.copr/snapshot-info.sh deleted file mode 100755 index 92399fe..0000000 --- a/.copr/snapshot-info.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/bash - -set -ex - -function loginfo() { - local msg=$1 - >&2 echo "[INFO]" $msg -} - -loginfo "Determine date in YYYYMMDD form" -llvm_snapshot_yyyymmdd=$(date +%Y%m%d) -[[ ! -z "${YYYYMMDD}" ]] && llvm_snapshot_yyyymmdd=$YYYYMMDD - -version_url=https://github.com/fedora-llvm-team/llvm-snapshots/releases/download/llvm-test-suite-version-sync/llvm-test-suite-version-${llvm_snapshot_yyyymmdd}.txt -loginfo "Get the revision for today from $version_url" -curl -sLf $version_url diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index f6503c5..15be3ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -version.spec.inc /test-suite-7.0.1rc2.src.fedora.tar.xz /test-suite-7.0.1.src.fedora.tar.xz /test-suite-8.0.0rc1.src.fedora.tar.xz @@ -6,95 +5,3 @@ version.spec.inc /test-suite-8.0.0rc3.src.fedora.tar.xz /test-suite-8.0.0rc4.src.fedora.tar.xz /test-suite-8.0.0.src.fedora.tar.xz -/test-suite-9.0.0rc4.src.fedora.tar.xz -/test-suite-9.0.0.src.fedora.tar.xz -/llvm-test-suite-10.0.0rc1.src.tar.xz -/test-suite-10.0.0rc1.src.fedora.tar.xz -/test-suite-10.0.0rc2.src.fedora.tar.xz -/test-suite-10.0.0rc3.src.fedora.tar.xz -/test-suite-10.0.0rc4.src.fedora.tar.xz -/test-suite-10.0.0rc5.src.fedora.tar.xz -/test-suite-10.0.0rc6.src.fedora.tar.xz -/test-suite-10.0.0.src.fedora.tar.xz -/test-suite-11.0.0rc1.src.fedora.tar.xz -/test-suite-11.0.0rc2.src.fedora.tar.xz -/test-suite-11.0.0rc3.src.fedora.tar.xz -/test-suite-11.0.0rc5.src.fedora.tar.xz -/test-suite-11.0.0rc6.src.fedora.tar.xz -/test-suite-11.0.0.src.fedora.tar.xz -/test-suite-11.0.1rc1.src.tar.xz -/test-suite-11.0.1rc1.src.fedora.tar.xz -/test-suite-11.0.1rc2.src.fedora.tar.xz -/test-suite-11.0.1.src.fedora.tar.xz -/test-suite-11.1.0rc1.src.fedora.tar.xz -/test-suite-11.1.0rc2.src.fedora.tar.xz -/test-suite-12.0.0rc1.src.fedora.tar.xz -/test-suite-12.0.0rc2.src.fedora.tar.xz -/test-suite-12.0.0rc3.src.fedora.tar.xz -/test-suite-12.0.0rc4.src.fedora.tar.xz -/test-suite-12.0.0rc5.src.fedora.tar.xz -/test-suite-12.0.0.src.tar.xz -/test-suite-12.0.0.src.tar.xz.sig -/test-suite-12.0.0.src.fedora.tar.xz -/test-suite-12.0.1rc1.src.fedora.tar.xz -/test-suite-12.0.1rc3.src.fedora.tar.xz -/test-suite-12.0.1.src.fedora.tar.xz -/test-suite-13.0.0rc1.src.fedora.tar.xz -/test-suite-13.0.0.src.tar.xz -/test-suite-13.0.0.src.tar.xz.sig -/test-suite-13.0.0.src.fedora.tar.xz -/test-suite-14.0.0.src.fedora.tar.xz -/test-suite-15.0.0.src.fedora.tar.xz -/test-suite-15.0.4.src.fedora.tar.xz -/test-suite-15.0.6.src.fedora.tar.xz -/test-suite-15.0.7.src.fedora.tar.xz -/test-suite-16.0.0.src.fedora.tar.xz -/test-suite-16.0.1.src.fedora.tar.xz -/test-suite-16.0.2.src.fedora.tar.xz -/test-suite-16.0.3.src.fedora.tar.xz -/test-suite-16.0.4.src.fedora.tar.xz -/test-suite-16.0.5.src.fedora.tar.xz -/test-suite-16.0.6.src.fedora.tar.xz -/test-suite-17.0.0rc1.src.fedora.tar.xz -/test-suite-17.0.0rc2.src.fedora.tar.xz -/test-suite-17.0.0rc3.src.fedora.tar.xz -/test-suite-17.0.0rc4.src.fedora.tar.xz -/test-suite-17.0.1.src.fedora.tar.xz -/test-suite-17.0.2.src.fedora.tar.xz -/test-suite-17.0.3.src.fedora.tar.xz -/test-suite-17.0.4.src.fedora.tar.xz -/test-suite-17.0.5.src.fedora.tar.xz -/test-suite-17.0.6.src.fedora.tar.xz -/test-suite-18.1.0rc4.src.fedora.tar.xz -/test-suite-18.1.1.src.tar.xz -/test-suite-18.1.1.src.fedora.tar.xz -/test-suite-18.1.2.src.fedora.tar.xz -/test-suite-18.1.3.src.fedora.tar.xz -/test-suite-18.1.4.src.fedora.tar.xz -/test-suite-18.1.6.src.fedora.tar.xz -/test-suite-18.1.7.src.fedora.tar.xz -/test-suite-18.1.8.src.fedora.tar.xz -/test-suite-19.1.0-rc4.src.fedora.tar.xz -/test-suite-19.1.0.src.fedora.tar.xz -/test-suite-19.1.3.src.fedora.tar.xz -/test-suite-19.1.4.src.fedora.tar.xz -/test-suite-19.1.5.src.fedora.tar.xz -/test-suite-19.1.6.src.fedora.tar.xz -/test-suite-19.1.7.src.fedora.tar.xz -/test-suite-20.1.0.src.fedora.tar.xz -/test-suite-20.1.1.src.fedora.tar.xz -/test-suite-20.1.2.src.fedora.tar.xz -/test-suite-20.1.3.src.fedora.tar.xz -/test-suite-20.1.5.src.fedora.tar.xz -/test-suite-20.1.6.src.fedora.tar.xz -/test-suite-20.1.7.src.fedora.tar.xz -/test-suite-20.1.8.src.fedora.tar.xz -/test-suite-21.1.0.src.fedora.tar.xz -/test-suite-21.1.1.src.fedora.tar.xz -/test-suite-21.1.2.src.fedora.tar.xz -/test-suite-21.1.3.src.fedora.tar.xz -/test-suite-21.1.4.src.fedora.tar.xz -/test-suite-21.1.5.src.fedora.tar.xz -/test-suite-21.1.6.src.fedora.tar.xz -/test-suite-21.1.7.src.fedora.tar.xz -/test-suite-21.1.8.src.fedora.tar.xz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index a3f8631..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# We want to use the following Packit functions in the llvm package: -# pull_from_upstream - -# See the documentation for more information: -# https://packit.dev/docs/configuration/ - -specfile_path: llvm-test-suite.spec - -# name in upstream package repository or registry (e.g. in PyPI) -upstream_package_name: llvm -upstream_tag_template: llvmorg-{version} -# downstream (Fedora) RPM package name -downstream_package_name: llvm-test-suite -prerelease_suffix_pattern: "([.\\-_]?)(a(lpha)?|b(eta)?|r?c|pre(view)?)([.\\-_]?\\d+)?" -prerelease_suffix_macro: prerel - -# Do not create README.packit. -create_sync_note: false - -actions: - prepare-files: - - >- - bash -c "pushd $(mktemp -d); \ - cp $PACKIT_DOWNSTREAM_REPO/llvm-test-suite.spec \ - $PACKIT_DOWNSTREAM_REPO/release-keys.asc \ - $PACKIT_DOWNSTREAM_REPO/pkg_test_suite.sh \ - .; \ - ./pkg_test_suite.sh $PACKIT_PROJECT_VERSION; \ - mv test-suite-$PACKIT_PROJECT_VERSION.src.fedora.tar.xz $PACKIT_DOWNSTREAM_REPO;" - -jobs: - - job: pull_from_upstream - trigger: release - dist_git_branches: - # We try to keep fedora-latest in sync with fedora-rawhide with - # fast-forward merges. For that reason, we only update fedora-rawhide. - - fedora-rawhide - - -# We avoid to use koji_build and bodhi_update because llvm updates are -# frequently provided via side-tags due to the impact to other packages. diff --git a/0001-Fix-extra-Python3-print-statements.patch b/0001-Fix-extra-Python3-print-statements.patch new file mode 100644 index 0000000..14b8456 --- /dev/null +++ b/0001-Fix-extra-Python3-print-statements.patch @@ -0,0 +1,126 @@ +From 16e158c83445054736d40b77626eca81958f53dc Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +Date: Mon, 4 Feb 2019 15:18:03 +0000 +Subject: [PATCH] Fix extra Python3 print statements + +--- + ABI-Testsuite/linux-x86.py | 17 +++++++++-------- + ABI-Testsuite/test/lit.site.cfg | 2 +- + LNTBased/lib/spec.py | 9 +++++---- + 3 files changed, 15 insertions(+), 13 deletions(-) + +diff --git a/ABI-Testsuite/linux-x86.py b/ABI-Testsuite/linux-x86.py +index 41873cc..bbab93c 100755 +--- a/ABI-Testsuite/linux-x86.py ++++ b/ABI-Testsuite/linux-x86.py +@@ -1,5 +1,6 @@ + # This file is distributed under the University of Illinois Open Source License. + # See LICENSE.TXT for details. ++from __future__ import print_function + import os + import sys + wopt = " -w" +@@ -70,22 +71,22 @@ def build_linker_name(cn): + + import subprocess + if __name__ == "__main__": +- print sys.argv ++ print(sys.argv) + litargs = [sys.argv[0]] # args for lit.main + c_compiler_name = sys.argv[1].strip() + cxx_compiler_name = build_cxx_compiler_name(c_compiler_name) + linker_name = build_linker_name(c_compiler_name) +- #print "C++ compiler:", cxx_compiler_name +- #print "linker :", linker_name ++ #print("C++ compiler:", cxx_compiler_name) ++ #print("linker :", linker_name) + for la in sys.argv[2:]: + litargs.append(la) + sys.argv = litargs + cmd = c_compiler_name.split() + [ "-o", "b.exe", "test/common/genselector.c"] +- #print "cmd = ", cmd ++ #print("cmd = ", cmd) + rv = subprocess.call(cmd) +- #print "rv = " , rv ++ #print("rv = " , rv) + if rv != 0: +- print "compiler failed: ", cmd ++ print("compiler failed: ", cmd) + sys.exit(1) + rv = subprocess.call("./b.exe") + fp = open("nselector.h") +@@ -104,14 +105,14 @@ if __name__ == "__main__": + test_params["linker"] = linker_name + test_params["Platform"] = "linux-" + cmd[0] + +- print "test_params = " , test_params ++ print("test_params = " , test_params) + builtin_parameters = { + 'build_mode' : "Release", + 'llvm_site_config' : os.path.join(os.getcwd(), 'lit.site.cfg'), + 'clang_site_config': os.path.join(os.getcwd(), 'lit.site.cfg'), + 'test_params' : test_params + } +- #print "builtin_params = " , test_params ++ #print("builtin_params = " , test_params) + from lit.main import main + main(builtin_parameters) + +diff --git a/ABI-Testsuite/test/lit.site.cfg b/ABI-Testsuite/test/lit.site.cfg +index 7e205c1..7fb8d1c 100755 +--- a/ABI-Testsuite/test/lit.site.cfg ++++ b/ABI-Testsuite/test/lit.site.cfg +@@ -153,7 +153,7 @@ def determinePlatform(): + hfp.write("#define ABISELECT(a,b) b // LP64 x86\n") + # #sys.exit(1) + else: +- print "ERROR: Invalid combination of config options. tspec= " , tspec ++ print("ERROR: Invalid combination of config options. tspec= " , tspec) + sys.exit(1) + hfp.close() + +diff --git a/LNTBased/lib/spec.py b/LNTBased/lib/spec.py +index 853584a..d8c0ec9 100644 +--- a/LNTBased/lib/spec.py ++++ b/LNTBased/lib/spec.py +@@ -1,5 +1,6 @@ + #!/usr/bin/env python + # -*- Python -*- ++from __future__ import print_function + + import os + import shutil +@@ -109,7 +110,7 @@ class TestModule(nt.TestModule): + with open(command_file, 'w') as f: + # Chdir here so that the redirects are put into CWD as well. + remote_command = 'cd %s\n%s\n' % (cwd, cmdstr) +- print >>self.log, "command:", remote_command, ++ print("command:", remote_command, file=self.log, end='') + f.write(remote_command) + + st = os.stat(command_file) +@@ -155,10 +156,10 @@ class TestModule(nt.TestModule): + suitedir = os.path.join(suitedir, 'CPU' + self.year) + + self.datadir = os.path.join(suitedir, self.benchmark, 'data') +- print >>self.log, "%s\n options: %s\n\nmake variables: %s\n\n" % (self.testname, str(options), str(make_variables)) ++ print("%s\n options: %s\n\nmake variables: %s\n\n" % (self.testname, str(options), str(make_variables)), file=self.log) + + if not os.path.exists(self.datadir): +- print >>self.log, "skipping, no source under externals" ++ print("skipping, no source under externals", file=self.log) + return [] + + res = self.configure_test_suite(self.OBJROOT) +@@ -209,7 +210,7 @@ class TestModule(nt.TestModule): + if result != 0: + return self.fail() + if not os.path.exists(os.path.join(pgo_dir, 'run_%d.profraw' % i)): +- print >>self.log, 'Failed to create PGO output' ++ print('Failed to create PGO output', file=self.log) + return self.fail() + + llvm_profdata = os.path.join(os.path.dirname(CC), 'llvm-profdata') +-- +2.19.2 + diff --git a/0001-Make-Python-scripts-compatible-with-both-Python2-and.patch b/0001-Make-Python-scripts-compatible-with-both-Python2-and.patch new file mode 100644 index 0000000..ee88d59 --- /dev/null +++ b/0001-Make-Python-scripts-compatible-with-both-Python2-and.patch @@ -0,0 +1,272 @@ +From 1bd70037c40aaf8b5a230e9cca9707a4ba047115 Mon Sep 17 00:00:00 2001 +From: serge-sans-paille +Date: Mon, 17 Dec 2018 08:51:41 +0000 +Subject: [PATCH] Make Python scripts compatible with both Python2 and Python3 + +Mostly: + +- Update shebang +- From __future__ import print_functions +- Portable way of iterating on dictionaries +--- + CompareDebugInfo.py | 36 ++++++++++++++++-------------------- + FindMissingLineNo.py | 4 +--- + litsupport/modules/stats.py | 4 ++-- + utils/compare.py | 26 ++++++++++++++------------ + utils/tdiff.py | 6 +++--- + 5 files changed, 36 insertions(+), 40 deletions(-) + +diff --git a/CompareDebugInfo.py b/CompareDebugInfo.py +index be6fa2368..121014e74 100755 +--- a/CompareDebugInfo.py ++++ b/CompareDebugInfo.py +@@ -1,4 +1,5 @@ + #!/usr/bin/python ++from __future__ import print_function + + import os + import sys +@@ -45,25 +46,24 @@ class BreakPoint: + self.values[arg_name] = value + + def __repr__(self): +- print self.name +- items = self.values.items() +- for i in range(len(items)): +- print items[i][0]," = ",items[i][1] ++ print(self.name) ++ for k, v in self.values.items(): ++ print(k, "=", v) + return '' + + def compare_args(self, other, file): + myitems = self.values.items() +- otheritems = other.values.items() ++ otheritems = list(other.values.items()) + match = False +- for i in range(len(myitems)): ++ for i, my_item in enumerate(my_items): + if i >= len(otheritems): + match = True +- self.missing_args.append(myitems[i][0]) +- elif cmp(myitems[i][1], otheritems[i][1]): ++ self.missing_args.append(myitem[0]) ++ elif cmp(myitem[1], otheritems[i][1]): + match = True +- self.notmatching_args.append(myitems[i][0]) ++ self.notmatching_args.append(myitem[0]) + else: +- self.matching_args.append(myitems[i][0]) ++ self.matching_args.append(myitem[0]) + + self.print_list(self.matching_args, " Matching arguments ", file) + self.print_list(self.notmatching_args, " Not Matching arguments ", file) +@@ -108,9 +108,7 @@ f2_items = f2_breakpoints.items() + + f = open(LOG_FILE, "w") + f.write("Log output\n") +-for f2bp in range(len(f2_items)): +- id = f2_items[f2bp][0] +- bp = f2_items[f2bp][1] ++for id, bp in f2_items: + bp1 = f1_breakpoints.get(id) + if bp1 is None: + bp.setMissing() +@@ -127,9 +125,7 @@ read_input(NATIVE_OPT_DBG_OUTPUT_FILE, nf2_breakpoints) + nf2_items = nf2_breakpoints.items() + + nfl = open(NATIVE_LOG_FILE, "w") +-for nf2bp in range(len(nf2_items)): +- id = nf2_items[nf2bp][0] +- bp = nf2_items[nf2bp][1] ++for id, bp in nf2_items: + bp1 = nf1_breakpoints.get(id) + if bp1 is None: + bp.setMissing() +@@ -141,8 +137,8 @@ f1_arg_count = 0 + f1_matching_arg_count = 0 + f1_notmatching_arg_count = 0 + f1_missing_arg_count = 0 +-for idx in range(len(f1_items)): +- bp = f1_items[idx][1] ++for f1_item in f1_items: ++ bp = f1_item[1] + f1_arg_count = f1_arg_count + bp.getArgCount() + f1_matching_arg_count = f1_matching_arg_count + bp.getMatchingArgCount() + f1_notmatching_arg_count = f1_notmatching_arg_count + bp.getNotMatchingArgCount() +@@ -152,8 +148,8 @@ nf1_arg_count = 0 + nf1_matching_arg_count = 0 + nf1_notmatching_arg_count = 0 + nf1_missing_arg_count = 0 +-for idx in range(len(nf1_items)): +- bp = nf1_items[idx][1] ++for nf1_item in nf1_items: ++ bp = nf1_item[1] + nf1_arg_count = nf1_arg_count + bp.getArgCount() + nf1_matching_arg_count = nf1_matching_arg_count + bp.getMatchingArgCount() + nf1_notmatching_arg_count = nf1_notmatching_arg_count + bp.getNotMatchingArgCount() +diff --git a/FindMissingLineNo.py b/FindMissingLineNo.py +index c92b5ed41..ee25a1f86 100755 +--- a/FindMissingLineNo.py ++++ b/FindMissingLineNo.py +@@ -40,9 +40,7 @@ xfailed_lines = {} + read_inputfile(XFAIL_FILE, xfailed_lines) + + dbg_line_items = dbg_lines.items() +-for f in range(len(dbg_line_items)): +- fname = dbg_line_items[f][0] +- fset = dbg_line_items[f][1] ++for fname, fset in dbg_line_items: + optset = dbg_opt_lines.get(fname) + nativeoptset = native_dbg_opt_lines.get(fname) + xfailedset = xfailed_lines.get(os.path.basename(fname)) +diff --git a/litsupport/modules/stats.py b/litsupport/modules/stats.py +index 4cba3e8a1..125342c15 100644 +--- a/litsupport/modules/stats.py ++++ b/litsupport/modules/stats.py +@@ -14,7 +14,7 @@ def _mergeStats(global_stats, statsfilename): + except Exception as e: + logging.warning("Could not read '%s'", statsfilename, exc_info=e) + return +- for name, value in stats.iteritems(): ++ for name, value in stats.items(): + global_stats[name] += value + + +@@ -37,7 +37,7 @@ def _getStats(context): + logging.warning("No stats for '%s'", context.test.getFullName()) + + result = dict() +- for key, value in stats.iteritems(): ++ for key, value in stats.items(): + result[key] = value + return result + +diff --git a/utils/compare.py b/utils/compare.py +index b65787707..fa93b24a6 100755 +--- a/utils/compare.py ++++ b/utils/compare.py +@@ -1,8 +1,10 @@ +-#!/usr/bin/env python2.7 ++#!/usr/bin/env python + """Tool to filter, organize, compare and display benchmarking results. Usefull + for smaller datasets. It works great with a few dozen runs it is not designed to + deal with hundreds. + Requires the pandas library to be installed.""" ++from __future__ import print_function ++ + import pandas as pd + import sys + import os.path +@@ -19,7 +21,7 @@ def read_lit_json(filename): + info_columns = ['hash'] + # Pass1: Figure out metrics (= the column index) + if 'tests' not in jsondata: +- print "%s: Could not find toplevel 'tests' key" ++ print("%s: Could not find toplevel 'tests' key") + sys.exit(1) + for test in jsondata['tests']: + name = test.get("name") +@@ -31,7 +33,7 @@ def read_lit_json(filename): + sys.exit(1) + names.add(name) + if "metrics" not in test: +- print "Warning: '%s' has No metrics!" % test['name'] ++ print("Warning: '%s' has No metrics!" % test['name']) + continue + for name in test["metrics"].keys(): + if name not in columnindexes: +@@ -54,9 +56,9 @@ def read_lit_json(filename): + + datarow = [nan] * len(columns) + if "metrics" in test: +- for (metricname, value) in test['metrics'].iteritems(): ++ for (metricname, value) in test['metrics'].items(): + datarow[columnindexes[metricname]] = value +- for (name, value) in test.iteritems(): ++ for (name, value) in test.items(): + index = columnindexes.get(name) + if index is not None: + datarow[index] = test[name] +@@ -148,7 +150,7 @@ def print_filter_stats(reason, before, after): + n_after = len(after.groupby(level=1)) + n_filtered = n_before - n_after + if n_filtered != 0: +- print "%s: %s (filtered out)" % (reason, n_filtered) ++ print("%s: %s (filtered out)" % (reason, n_filtered)) + + # Truncate a string to a maximum length by keeping a prefix, a suffix and ... + # in the middle +@@ -222,8 +224,8 @@ def print_result(d, limit_output=True, shorten_names=True, + pd.set_option("display.max_colwidth", 0) + out = dataout.to_string(index=False, justify='left', + float_format=float_format, formatters=formatters) +- print out +- print d.describe() ++ print(out) ++ print(d.describe()) + + if __name__ == "__main__": + parser = argparse.ArgumentParser(prog='compare.py') +@@ -303,7 +305,7 @@ if __name__ == "__main__": + # Filter data + proggroup = data.groupby(level=1) + initial_size = len(proggroup.indices) +- print "Tests: %s" % (initial_size,) ++ print("Tests: %s" % (initial_size,)) + if config.filter_failed and hasattr(data, 'Exec'): + newdata = filter_failed(data) + print_filter_stats("Failed", data, newdata) +@@ -326,10 +328,10 @@ if __name__ == "__main__": + data = newdata + final_size = len(data.groupby(level=1)) + if final_size != initial_size: +- print "Remaining: %d" % (final_size,) ++ print("Remaining: %d" % (final_size,)) + + # Reduce / add columns +- print "Metric: %s" % (",".join(metrics),) ++ print("Metric: %s" % (",".join(metrics),)) + if len(metrics) > 0: + data = data[metrics] + data = add_diff_column(data) +@@ -339,7 +341,7 @@ if __name__ == "__main__": + sortkey = data.columns[0] + + # Print data +- print "" ++ print("") + shorten_names = not config.full + limit_output = (not config.all) and (not config.full) + print_result(data, limit_output, shorten_names, config.show_diff, sortkey) +diff --git a/utils/tdiff.py b/utils/tdiff.py +index 9f4cedbc8..dcfa167c2 100755 +--- a/utils/tdiff.py ++++ b/utils/tdiff.py +@@ -95,7 +95,7 @@ def determine_max_commandline_len(): + if sc_arg_max <= 0: + return 10000 # wild guess + env_len = 0 +- for key,val in os.environ.iteritems(): ++ for key,val in os.environ.items(): + env_len += len(key) + len(val) + 10 + return sc_arg_max - env_len + +@@ -140,12 +140,12 @@ def filelist(mode, target, cwd, config): + + if config.mode == 'sources': + # Take leafs in the dependency tree +- for target, depnode in tree.iteritems(): ++ for target, depnode in tree.items(): + if len(depnode.inputs) == 0: + yield target + else: + # Take files ending in '.o' +- for target, depnode in tree.iteritems(): ++ for target, depnode in tree.items(): + if target.endswith(".o"): + # Determine .s/.stats ending used by -save-temps=obj or + # -save-stats=obj +-- +2.17.2 + diff --git a/changelog b/changelog deleted file mode 100644 index 8169edb..0000000 --- a/changelog +++ /dev/null @@ -1,353 +0,0 @@ -* Thu Nov 06 2025 Tom Stellard - 21.1.5-1 -- Update to LLVM 21.1.5 - -* Fri Oct 24 2025 Tom Stellard - 21.1.4-1 -- Update to LLVM 21.1.4 - -* Sat Oct 11 2025 Tom Stellard - 21.1.3-1 -- Update to LLVM 21.1.3 - -* Thu Sep 25 2025 Tom Stellard - 21.1.2-1 -- Update to LLVM 21.1.2 - -* Thu Sep 11 2025 Tom Stellard - 21.1.1-1 -- Update to LLVM 21.1.1 - -* Thu Aug 28 2025 Tom Stellard - 21.1.0-1 -- Update to LLVM 21.1.0 - -* Thu Jul 24 2025 Fedora Release Engineering - 20.1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jul 10 2025 Nikita Popov - 20.1.8-1 -- Update to LLVM 20.1.8 - -* Fri Jun 20 2025 Nikita Popov - 20.1.7-1 -- Update to LLVM 20.1.7 - -* Mon Jun 02 2025 Nikita Popov - 20.1.6-1 -- Update to LLVM 20.1.6 - -* Mon May 26 2025 Nikita Popov - 20.1.5-1 -- Update to LLVM 20.1.5 - -* Tue Apr 22 2025 Nikita Popov - 20.1.3-1 -- Update to LLVM 20.1.3 - -* Thu Apr 03 2025 Nikita Popov - 20.1.2-1 -- Update to LLVM 20.1.2 - -* Thu Mar 20 2025 Nikita Popov - 20.1.1-1 -- Update to LLVM 20.1.1 - -* Wed Mar 05 2025 Nikita Popov - 20.1.0-1 -- Update to LLVM 20.1.0 - -* Fri Jan 24 2025 Timm Bäder - 19.1.7-2 -- Backport upstream patch to fix typedef bool error with GCC 15 - -* Wed Jan 22 2025 Timm Bäder - 19.1.7-1 -- Update to 19.1.7 - -* Fri Jan 17 2025 Fedora Release Engineering - 19.1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jan 02 2025 Timm Bäder - 19.1.6-1 -- Update to 19.1.6 - -* Fri Dec 06 2024 Timm Bäder - 19.1.5-1 -- Update to 19.1.5 - -* Mon Nov 25 2024 Timm Bäder - 19.1.4-1 -- Update to 19.1.4 - -* Fri Nov 08 2024 Timm Bäder - 19.1.3-1 -- Update to 19.1.3 - -* Tue Oct 15 2024 Konrad Kleine - 19.1.0-3 -- Remove MultiSource/Applications/ClamAV directory because of viruses in input files - -* Wed Oct 09 2024 Konrad Kleine - 19.1.0-2 -- Remove broken links in source tarball - -* Thu Sep 19 2024 Timm Bäder - 19.1.0-1 -- Update to 19.1.0 - -* Tue Sep 17 2024 Timm Bäder - 19.1.0~rc4-1 -- Update to 19.1.0-rc4 - -* Mon Sep 02 2024 Miroslav Suchý - 18.1.8-3 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 18.1.8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jul 12 2024 Jesus Checa Hidalgo - 18.1.8-1 -- 18.1.8 Release - -* Fri Jun 14 2024 Tom Stellard - 18.1.7-1 -- 18.1.7 Release - -* Tue May 21 2024 Tom Stellard - 18.1.6-1 -- 18.1.6 Release - -* Sat May 04 2024 Tom Stellard - 18.1.4-1 -- 18.1.4 Release - -* Wed Apr 17 2024 Tom Stellard - 18.1.3-1 -- 18.1.3 Release - -* Fri Mar 22 2024 Tom Stellard - 18.1.2-1 -- 18.1.2 Release - -* Wed Mar 13 2024 Tom Stellard - 18.1.1-1 -- 18.1.1 Release - -* Thu Feb 29 2024 Tom Stellard - 18.1.0~rc4-1 -- 18.1.0-rc4 Release - -* Thu Jan 25 2024 Fedora Release Engineering - 17.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 17.0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Tue Nov 28 2023 Tulio Magno Quites Machado Filho - 17.0.6-1 -- Update to LLVM 17.0.6 - -* Thu Nov 16 2023 Tulio Magno Quites Machado Filho - 17.0.5-1 -- Update to LLVM 17.0.5 - -* Wed Nov 01 2023 Tulio Magno Quites Machado Filho - 17.0.4-1 -- Update to LLVM 17.0.4 - -* Tue Oct 17 2023 Tulio Magno Quites Machado Filho - 17.0.3-1 -- Update to LLVM 17.0.3 - -* Tue Oct 03 2023 Tulio Magno Quites Machado Filho - 17.0.2-1 -- Update to LLVM 17.0.2 - -* Sat Sep 23 2023 Tulio Magno Quites Machado Filho - 17.0.1-1 -- Update to LLVM 17.0.1 - -* Fri Sep 08 2023 Tulio Magno Quites Machado Filho - 17.0.0~rc4-1 -- Update to LLVM 17.0.0 RC4 - -* Thu Aug 24 2023 Tulio Magno Quites Machado Filho - 17.0.0~rc3-1 -- Update to LLVM 17.0.0 RC3 - -* Wed Aug 23 2023 Tulio Magno Quites Machado Filho - 17.0.0~rc2-1 -- Update to LLVM 17.0.0 RC2 - -* Tue Aug 01 2023 Tulio Magno Quites Machado Filho - 17.0.0~rc1-1 -- Update to LLVM 17.0.0 RC1 - -* Thu Jul 20 2023 Fedora Release Engineering - 16.0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon Jul 10 2023 Tulio Magno Quites Machado Filho - 16.0.6-1 -- Update to LLVM 16.0.6 - -* Tue Jun 06 2023 Tulio Magno Quites Machado Filho - 16.0.5-1 -- Update to LLVM 16.0.5 - -* Sat May 20 2023 Tulio Magno Quites Machado Filho - 16.0.4-1 -- Update to LLVM 16.0.4 - -* Wed May 10 2023 Tulio Magno Quites Machado Filho - 16.0.3-1 -- Update to LLVM 16.0.3 - -* Thu Apr 27 2023 Tulio Magno Quites Machado Filho - 16.0.2-1 -- Update to LLVM 16.0.2 - -* Thu Apr 13 2023 Tulio Magno Quites Machado Filho - 16.0.1-1 -- Update to LLVM 16.0.1 - -* Tue Mar 21 2023 Tulio Magno Quites Machado Filho - 16.0.0-1 -- Update to LLVM 16.0.0 - -* Thu Jan 19 2023 Fedora Release Engineering - 15.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jan 13 2023 Nikita Popov - 15.0.7-1 -- Update to LLVM 15.0.7 - -* Tue Dec 06 2022 Nikita Popov - 15.0.6-1 -- Update to LLVM 15.0.6 - -* Mon Nov 07 2022 Nikita Popov - 15.0.4-1 -- Update to LLVM 15.0.4 - -* Tue Sep 06 2022 Nikita Popov - 15.0.0-1 -- Update to LLVM 15.0.0 - -* Thu Jul 21 2022 Fedora Release Engineering - 14.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Mar 30 2022 Tom Stellard - 14.0.0-1 -- 14.0.0 Release - -* Thu Jan 20 2022 Fedora Release Engineering - 13.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Oct 01 2021 Tom Stellard - 13.0.0-1 -- 13.0.0 Release - -* Mon Aug 09 2021 Tom Stellard - 13.0.0~rc1-1 -- 13.0.0-rc1 Release - -* Thu Jul 22 2021 Fedora Release Engineering - 12.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Wed Jul 14 2021 Tom Stellard - 12.0.1-1 -- 12.0.1 Release - -* Wed Jun 30 2021 Tom Stellard - 12.0.1~rc3-1 -- 12.0.1-rc3 Release - -* Thu Jun 03 2021 Tom Stellard - 12.0.1~rc1-1 -- 12.0.1-rc1 Release - -* Fri Apr 16 2021 Tom Stellard - 12.0.0-1 -- 12.0.0 Release - -* Thu Apr 08 2021 sguelton@redhat.com - 12.0.0-0.6.rc5 -- New upstream release candidate - -* Fri Apr 02 2021 sguelton@redhat.com - 12.0.0-0.5.rc4 -- New upstream release candidate - -* Thu Mar 11 2021 sguelton@redhat.com - 12.0.0-0.4.rc3 -- LLVM 12.0.0 rc3 - -* Tue Mar 09 2021 sguelton@redhat.com - 12.0.0-0.3.rc2 -- rebuilt - -* Wed Feb 24 2021 sguelton@redhat.com - 12.0.0-0.2.rc2 -- llvm 12.0.0-rc2 release - -* Wed Feb 03 2021 sguelton@redhat.com - 12.0.0-0.1.rc1 -- llvm 12.0.0-rc1 release - -* Tue Jan 26 2021 Fedora Release Engineering - 11.1.0-0.3.rc2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Jan 22 2021 Serge Guelton - 11.1.0-0.2.rc2 -- llvm 11.1.0-rc2 release - -* Thu Jan 14 2021 Serge Guelton - 11.1.0-0.1.rc1 -- 11.1.0-rc1 release - -* Wed Jan 06 2021 Serge Guelton - 11.0.1-3 -- LLVM 11.0.1 final - -* Mon Dec 21 2020 sguelton@redhat.com - 11.0.1-2.rc2 -- llvm 11.0.1-rc2 - -* Tue Dec 01 2020 sguelton@redhat.com - 11.0.1-1.rc1 -- llvm 11.0.1-rc1 - -* Thu Oct 15 2020 sguelton@redhat.com - 11.0.0-1 -- Fix NVR - -* Mon Oct 12 2020 sguelton@redhat.com - 11.0.0-0.5 -- llvm 11.0.0 - final release - -* Thu Oct 08 2020 sguelton@redhat.com - 11.0.0-0.4.rc6 -- 11.0.0-rc6 - -* Fri Oct 02 2020 sguelton@redhat.com - 11.0.0-0.3.rc5 -- 11.0.0-rc5 Release - -* Sun Sep 27 2020 sguelton@redhat.com - 11.0.0-0.2.rc3 -- Fix NVR - -* Thu Sep 24 2020 sguelton@redhat.com - 11.0.0-0.1.rc3 -- 11.0.0-rc3 Release - -* Tue Sep 01 2020 sguelton@redhat.com - 11.0.0-0.1.rc2 -- 11.0.0-rc2 Release - -* Wed Aug 19 2020 Tom Stellard - 11.0.0-0.2.rc1 -- Fix build failure with clang 11 - -* Mon Aug 10 2020 Tom Stellard - 11.0.0-0.1.rc1 -- 11.0.0-rc1 Release - -* Tue Jul 28 2020 Fedora Release Engineering - 10.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jun 18 2020 Tom Stellard - 10.0.0-2 -- Fix build with newer glibc - -* Mon Mar 30 2020 sguelton@redhat.com - 10.0.0-1 -- 10.0.0 final - -* Tue Mar 24 2020 sguelton@redhat.com - 10.0.0-0.6.rc6 -- 10.0.0 rc6 - -* Sat Mar 21 2020 sguelton@redhat.com - 10.0.0-0.5.rc5 -- 10.0.0 rc5 - -* Sat Mar 14 2020 sguelton@redhat.com - 10.0.0-0.4.rc4 -- 10.0.0 rc4 - -* Thu Mar 05 2020 sguelton@redhat.com - 10.0.0-0.3.rc3 -- 10.0.0 rc3 - -* Fri Feb 14 2020 sguelton@redhat.com - 10.0.0-0.2.rc2 -- 10.0.0 rc2 - -* Fri Jan 31 2020 sguelton@redhat.com - 10.0.0-0.1.rc1 -- 10.0.0 rc1 - -* Wed Jan 29 2020 Fedora Release Engineering - 9.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Sep 20 2019 Tom Stellard - 9.0.0-1 -- 9.0.0 Release - -* Wed Sep 11 2019 Tom Stellard - 9.0.0-0.1.rc4 -- 9.0.0-rc4 Release - -* Thu Jul 25 2019 Fedora Release Engineering - 8.0.0-3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Wed May 29 2019 Tom Stellard - 8.0.0-3 -- Fix python2 print statement in ABI-Testsuite - -* Thu May 02 2019 Tom Stellard - 8.0.0-2 -- Bump lit version requirement - -* Wed Mar 20 2019 sguelton@redhat.com - 8.0.0-1 -- 8.0.0 final - -* Tue Mar 12 2019 sguelton@redhat.com - 8.0.0-0.4.rc4 -- 8.0.0 Release candidate 4 - -* Mon Mar 4 2019 sguelton@redhat.com - 8.0.0-0.3.rc3 -- 8.0.0 Release candidate 3 - -* Fri Feb 22 2019 sguelton@redhat.com - 8.0.0-0.2.rc2 -- 8.0.0 Release candidate 2 - -* Mon Feb 11 2019 sguelton@redhat.com - 8.0.0-0.1.rc1 -- 8.0.0 Release candidate 1 - -* Mon Feb 04 2019 sguelton@redhat.com - 7.0.1-4 -- Fix Python3 dependency - -* Fri Feb 01 2019 Fedora Release Engineering - 7.0.1-3.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Dec 21 2018 Miro Hrončok - 7.0.1-3 -- Remove Python2 dependency - -* Fri Dec 21 2018 Tom Stellard - 7.0.1-2 -- Bump version of lit dependency - -* Mon Dec 17 2018 sguelton@redhat.com - 7.0.1-1 -- 7.0.1 Release - -* Fri Oct 26 2018 Tom Stellard - 7.0.1-0.1.rc2 -- 7.0.1-rc2 Release diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index f2c6454..0000000 --- a/gating.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_testing -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} ---- !Policy -product_versions: - - fedora-* -decision_context: bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} diff --git a/license-files.txt b/license-files.txt index acad1f7..1a53234 100644 --- a/license-files.txt +++ b/license-files.txt @@ -1,15 +1,17 @@ autoconf/LICENSE.TXT +CTMark/ClamAV/COPYING CTMark/consumer-typeset/LICENSE CTMark/kimwitu++/COPYING CTMark/kimwitu++/LICENSE.TXT CTMark/mafft/license CTMark/SPASS/COPYING MicroBenchmarks/harris/LICENSE.txt -MicroBenchmarks/libs/benchmark/LICENSE +MicroBenchmarks/libs/benchmark-1.3.0/LICENSE MultiSource/Applications/aha/LICENSE.TXT MultiSource/Applications/ALAC/decode/LICENSE MultiSource/Applications/ALAC/encode/LICENSE MultiSource/Applications/ALAC/LICENSE +MultiSource/Applications/ClamAV/COPYING MultiSource/Applications/hbd/doc/COPYING MultiSource/Applications/hbd/LICENSE.TXT MultiSource/Applications/hexxagon/COPYING diff --git a/llvm-test-suite.spec b/llvm-test-suite.spec index 5bd842d..7bf9fb6 100644 --- a/llvm-test-suite.spec +++ b/llvm-test-suite.spec @@ -1,46 +1,24 @@ %global _binaries_in_noarch_packages_terminate_build %{nil} -%global llvm_test_suite_version 21.1.8 -#global rc_ver 3 -%global test_suite_srcdir test-suite-%{llvm_test_suite_version}%{?rc_ver:-rc%{rc_ver}}.src.fedora - -%bcond_with snapshot_build - -%if %{with snapshot_build} -%include %{_sourcedir}/version.spec.inc -%global llvm_test_suite_version_suffix pre%{llvm_test_suite_date}.g%{llvm_test_suite_git_revision_short} -%global test_suite_srcdir llvm-test-suite-%{llvm_test_suite_git_revision}.fedora -%endif +#%%global rc_ver 4 +%global test_suite_srcdir test-suite-%{version}%{?rc_ver:rc%{rc_ver}}.src.fedora Name: llvm-test-suite -Version: %{llvm_test_suite_version}%{?rc_ver:~rc%{rc_ver}}%{?llvm_test_suite_version_suffix:~%{llvm_test_suite_version_suffix}} -Release: %autorelease +Version: 8.0.0 +Release: 3%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: C/C++ Compiler Test Suite -License: NCSA AND BSD-3-Clause-LBNL AND BSD-4.3TAHOE AND dtoa AND GPL-1.0-only AND GPL-2.0-or-later AND GPL-2.0-only AND MIT AND PSF-2.0 AND LicenseRef-Fedora-Public-Domain AND LicenseRef-Fedora-UltraPermissive AND AML AND Rdisc AND Apache-2.0 AND LGPL-3.0-only +License: NCSA and BSD and GPLv1 and GPLv2+ and GPLv2 and MIT and Python and Public Domain and CRC32 and AML and Rdisc and ASL 2.0 and LGPLv3 URL: http://llvm.org -# The LLVM Test Suite contains programs with "BAD" or unknown licenses which should +# The LLVM Test Suite contains progrms with "BAD" or unknown licenses which should # be removed. Some of the unknown licenses may be OK, but until they are reviewed, # we will remove them. # Use the pkg_test_suite.sh script to generate the test-suite tarball: -# ./pkg_test_suite.sh - -# this condition is set by ./pkg_test_suite.sh to retrieve original sources -%if 0%{?original_sources:1} -%if %{with snapshot_build} -Source0: https://github.com/llvm/llvm-test-suite/archive/%{llvm_test_suite_git_revision}.tar.gz -%else -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{llvm_test_suite_version}%{?rc_ver:-rc%{rc_ver}}/test-suite-%{llvm_test_suite_version}%{?rc_ver:-rc%{rc_ver}}.src.tar.xz -%endif -%else +# wget http://llvm.org/releases/%%{version}/%%{test_suite_srcdir}.tar.xz +# ./pkg_test_suite.sh %%{test_suite_srcdir}.tar.xz Source0: %{test_suite_srcdir}.tar.xz -%endif Source1: license-files.txt Source2: pkg_test_suite.sh -Source3: changelog -%if %{with snapshot_build} -Source1000: version.spec.inc -%endif BuildArch: noarch # We need python3-devel for pathfix.py. @@ -48,11 +26,13 @@ BuildRequires: python3-devel Requires: cmake Requires: libstdc++-static -Requires: python3-lit >= 0.8.0 +Requires: python3-lit >= 0.7.1 Requires: llvm Requires: tcl Requires: which +Patch1: 0001-Fix-extra-Python3-print-statements.patch + %description C/C++ Compiler Test Suite that is maintained as an LLVM sub-project. This test suite can be run with any compiler, not just clang. @@ -61,17 +41,14 @@ suite can be run with any compiler, not just clang. %prep %autosetup -n %{test_suite_srcdir} -p1 -%py3_shebang_fix \ +pathfix.py -i %{__python3} -pn \ ParseMultipleResults \ utils/*.py \ CollectDebugInfoUsingLLDB.py \ CompareDebugInfo.py \ tools/get-report-time \ FindMissingLineNo.py \ - MicroBenchmarks/libs/benchmark/googletest/googlemock/test/*.py \ - MicroBenchmarks/libs/benchmark/googletest/googletest/test/*.py \ - MicroBenchmarks/libs/benchmark/tools/*.py - + MicroBenchmarks/libs/benchmark-1.3.0/tools/compare_bench.py chmod -R -x+X ABI-Testsuite @@ -96,5 +73,32 @@ cp -R %{_builddir}/%{test_suite_srcdir}/* %{buildroot}%{_datadir}/llvm-test-suit %changelog -%{?autochangelog:%autochangelog} -%{!?autochangelog:%include %{_sourcedir}/changelog} +* Tue Sep 24 2019 Tom Stellard - 8.0.0-3 +- Fix python3 compatibililty in ABI-Testsuite + +* Mon Sep 23 2019 Tom Stellard - 8.0.0-2 +- Bump python-lit version requirement + +* Wed Mar 20 2019 sguelton@redhat.com - 8.0.0-1 +- 8.0.0 final + +* Mon Feb 11 2019 sguelton@redhat.com - 8.0.0-1.rc1 +- 8.0.0 Release candidate 1 + +* Mon Feb 04 2019 sguelton@redhat.com - 7.0.1-4 +- Fix Python3 dependency + +* Fri Feb 01 2019 Fedora Release Engineering - 7.0.1-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Dec 21 2018 Miro Hrončok - 7.0.1-3 +- Remove Python2 dependency + +* Fri Dec 21 2018 Tom Stellard - 7.0.1-2 +- Bump version of lit dependency + +* Mon Dec 17 2018 sguelton@redhat.com - 7.0.1-1 +- 7.0.1 Release + +* Fri Oct 26 2018 Tom Stellard - 7.0.1-0.1.rc2 +- 7.0.1-rc2 Release diff --git a/pkg_test_suite.sh b/pkg_test_suite.sh index e695125..47c157d 100755 --- a/pkg_test_suite.sh +++ b/pkg_test_suite.sh @@ -1,47 +1,12 @@ #!/bin/bash set -ex - -SNAPSHOT_BUILD=${SNAPSHOT_BUILD:-0} - tmpdir=`mktemp -d` currentdir=`pwd` -version="$1" -if [ -n "$version" ]; then - gpghome=`mktemp -d` - original_sources="test-suite-$version.src.tar.xz" - download_url="https://github.com/llvm/llvm-project/releases/download/llvmorg-$version/$original_sources" - curl -O -L $download_url - curl -O -L $download_url.sig - gpg --homedir=$gpghome --yes --output=keyring.gpg --dearmor release-keys.asc - gpg --verify --homedir=$gpghome --keyring=./keyring.gpg $original_sources.sig $original_sources - rm -Rf $gpghome -else - if [[ "${SNAPSHOT_BUILD}" == "1" ]]; then - spectool \ - --define 'original_sources 1' \ - --define "_sourcedir ${PWD}" \ - --define "with_snapshot_build 1" \ - -g \ - -C . \ - llvm-test-suite.spec \ - | tee dl.log - else - spectool \ - --define 'original_sources 1' \ - -g \ - -C . \ - llvm-test-suite.spec \ - | tee dl.log - fi - original_sources=`head -1 dl.log | sed 's/.*\///'` - rm dl.log -fi +tar -C $tmpdir -xJf $1 - -tar -C $tmpdir -xvf $original_sources > $tmpdir/tar_output -test_suite_src=`head -1 $tmpdir/tar_output | sed -e 's/\/.*//'` +test_suite_src=`echo $1 | cut -d . -f 1-4` pushd $tmpdir test -d $test_suite_src @@ -65,14 +30,12 @@ POSSIBLY_BAD="\ MultiSource/Applications/Burg/ \ MultiSource/Benchmarks/MiBench/telecomm-FFT/" -VIRUSES="\ - MultiSource/Applications/ClamAV/" #siod: llvm.org/PR38648 BUGGY="\ MultiSource/Applications/siod" -for f in $UNKNOWN $BAD $POSSIBLY_BAD $BUGGY $VIRUSES; do +for f in $UNKNOWN $BAD $POSSIBLY_BAD $BUGGY; do test -d $test_suite_src/$f rm -Rf $test_suite_src/$f basedir=`dirname $f` @@ -80,28 +43,9 @@ for f in $UNKNOWN $BAD $POSSIBLY_BAD $BUGGY $VIRUSES; do cmake_file=$test_suite_src/$basedir/CMakeLists.txt test -f $cmake_file sed -i s/add_subdirectory\($dir\)//g $cmake_file -done -# The llvm-test-suite now contains broken symlinks because -# the link target was removed above, e.g. -# -# /usr/share/llvm-test-suite/CTMark/7zip -> ../MultiSource/Benchmarks/7zip -# /usr/share/llvm-test-suite/CTMark/lencod -> ../MultiSource/Applications/JM/lencod -# -# To fix these algorithmically, we have to find all broken -# symlinks and remove the add_subdirectory entry in the -# CMakeLists.txt in their parent directory. -broken_symlinks=$(find $test_suite_src -type l ! -exec test -e {} \; -print) -for f in $broken_symlinks; do - test -L $f - rm -fv $f - basedir=`dirname $f` - dir=`basename $f` - cmake_file=$basedir/CMakeLists.txt - test -f $cmake_file - sed -i s/add_subdirectory\($dir\)//g $cmake_file done tar --transform=s/$test_suite_src/$test_suite_src.fedora/ --show-transformed-names -cJf $currentdir/$test_suite_src.fedora.tar.xz $test_suite_src -popd +pushd rm -Rf $tmpdir diff --git a/release-keys.asc b/release-keys.asc deleted file mode 100644 index 3932562..0000000 --- a/release-keys.asc +++ /dev/null @@ -1,130 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -9RmlwZlOTFGcWBYl/cfRONn9qi9a6w== -=Lvw+ ------END PGP PUBLIC KEY BLOCK----- ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=tMzl ------END PGP PUBLIC KEY BLOCK----- ------BEGIN PGP PUBLIC KEY BLOCK----- - -mDMEaMgtRhYJKwYBBAHaRw8BAQdA4NRjJPhVd56sOM+QmTbZKkRT3bYbgg6+Bxed -CELeGp+0JUN1bGxlbiBSaG9kZXMgPGN1bGxlbi5yaG9kZXNAYXJtLmNvbT6IkwQT -FgoAOxYhBHEEbR6cZla91hFxhz6Dur9KT56FBQJoyC1GAhsDBQsJCAcCAiICBhUK -CQgLAgQWAgMBAh4HAheAAAoJED6Dur9KT56FkVwA/RLNMBHrjXoAKpRm1iIjiC6w -gLRqGOnj1qAqPqgntMmmAQCQ2lGpw46rvh88ng84IGsRF0JlTAYb6SR/YYNsQyah -Arg4BGjILUYSCisGAQQBl1UBBQEBB0B48hCLw13kduwibGDGoIax0BIa+f66IUC+ -HhNlucsjbgMBCAeIeAQYFgoAIBYhBHEEbR6cZla91hFxhz6Dur9KT56FBQJoyC1G -AhsMAAoJED6Dur9KT56FVssBAO1lL/S2cU65XFHgbjc6crwljDrD7PYbxBA7hDpi -pC4ZAP98rK1hGQ5wxpeiJ0heZ8zhpdUwEeymIDBaIcwgrJRFBQ== -=HcEB ------END PGP PUBLIC KEY BLOCK----- ------BEGIN PGP PUBLIC KEY BLOCK----- - -mDMEaMg2hBYJKwYBBAHaRw8BAQdA2J814YnhPQSdsyjwx8VxZ7AitqCnns9lzvkx -HX9lWMW0JERvdWdsYXMgWXVuZyA8ZG91Z2xhcy55dW5nQHNvbnkuY29tPoiTBBMW -CgA7FiEE/7M2iYDz5rtXNxRaMWxW0GTKy6UFAmjINoQCGwMFCwkIBwICIgIGFQoJ -CAsCBBYCAwECHgcCF4AACgkQMWxW0GTKy6XjYgEApJ7p+o7EAeaaOdO2f440KDfg -t7haaBLaxr5fiaSKjkYA+gLDxWOh39Y84upf23qMmpSTZ3SK5LvJtBTVtV7AEX0B -uDgEaMg2hBIKKwYBBAGXVQEFAQEHQL3CL6jHZAakhtLLj2Ks34u7ItY/7USl/bYk -f/+mZTJMAwEIB4h4BBgWCgAgFiEE/7M2iYDz5rtXNxRaMWxW0GTKy6UFAmjINoQC -GwwACgkQMWxW0GTKy6VTOgEArDn9bg58W7bfZfVfneJJbIeICEf3NN9IovbRbAOB -ax0A/RxtrG4qowLlo907vb25ITOa1hBoheSV2wNoDaDUhFEF -=JQ8u ------END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index 7ebb032..4c84eae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (test-suite-21.1.8.src.fedora.tar.xz) = f53242fc0f2b218b1a245abb4eced88a5bc92f1e2817b8915edf04b75125275e2213d9dc31df97a84d4c1a557a83a6605780449c065ee62db9390e1f2948e4e3 +SHA512 (test-suite-8.0.0.src.fedora.tar.xz) = 617e3a96d7fd182c05a4ce5ecf1ad2428eefc6c07f984174fb1ef16d8f43875af14bff61cb45f99565ad0fbdc3963f6d751ab7e8e786fbc2e5117dd1d09eeefc diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf deleted file mode 100644 index 8639aa8..0000000 --- a/tests/build-gating.fmf +++ /dev/null @@ -1,21 +0,0 @@ -summary: LLVM test-suite for build/PR gating -adjust: - - because: "Plan to be ran when either executed locally, or executed by CI system to gate a build or PR." - when: >- - trigger is defined - and trigger != commit - and trigger != build - enabled: false - -discover: - how: fmf - url: https://src.fedoraproject.org/tests/llvm.git - ref: main - test: - - abi-test-suite - - llvm-test-suite -execute: - how: tmt -provision: - hardware: - memory: ">=4 GiB" diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..fdc307c --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,13 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required_packages: + - clang + - ninja-build + tests: + - clang: + dir: ./ + run: cd $(mktemp -d) && cmake -G Ninja /usr/share/llvm-test-suite/ -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DTEST_SUITE_LIT_FLAGS="-svj1" && ninja -j 1 check +