#18 Prune reference to llvm-test-suite
Merged 5 years ago by tstellar. Opened 5 years ago by sergesanspaille.
rpms/ sergesanspaille/clang fix/prune-llvm-test-suite  into  master

file modified
+3 -43
@@ -54,7 +54,6 @@ 

  

  %global clang_srcdir cfe-%{version}%{?rc_ver:rc%{rc_ver}}.src

  %global clang_tools_srcdir clang-tools-extra-%{version}%{?rc_ver:rc%{rc_ver}}.src

- %global test_suite_srcdir test-suite-%{version}%{?rc_ver:rc%{rc_ver}}.src.fedora

  

  Name:		%pkg_name

  Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
@@ -66,14 +65,6 @@ 

  Source0:	http://%{?rc_ver:pre}releases.llvm.org/%{version}/%{?rc_ver:rc%{rc_ver}}/%{clang_srcdir}.tar.xz

  %if !0%{?compat_build}

  Source1:	http://llvm.org/releases/%{version}/%{clang_tools_srcdir}.tar.xz

- 

- # 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:

- # wget http://llvm.org/releases/%%{version}/%%{test_suite_srcdir}.tar.xz

- # ./pkg_test_suite.sh %%{test_suite_srcdir}.tar.xz

- Source2:	%{test_suite_srcdir}.tar.xz

  %endif

  

  Patch0:		0001-lit.cfg-Add-hack-so-lit-can-find-not-and-FileCheck.patch
@@ -200,22 +191,6 @@ 

  %description -n python2-clang

  %{summary}.

  

- %package -n llvm-test-suite

- Summary: C/C++ Compiler Test Suite

- License: NCSA, MIT, GPL, Python

- Requires: cmake

- Requires: libstdc++-static

- Requires: python3-lit = 0.7.0

- # ABI-Testsuite requires python2-lit

- Requires: python2-lit = 0.7.0

- Requires: llvm

- Requires: tcl

- Requires: which

- 

- %description -n llvm-test-suite

- C/C++ Compiler Test Suite that is mantained as an LLVM sub-project.  This test

- suite can be run with any compiler, not just clang.

- 

  %endif

  

  
@@ -231,17 +206,6 @@ 

  pathfix.py -i %{__python2} -pn \

  	include-fixer/find-all-symbols/tool/run-find-all-symbols.py

  

- %setup -T -q -b 2 -n %{test_suite_srcdir}

- 

- pathfix.py -i %{__python2} -pn \

- 	ParseMultipleResults \

- 	utils/*.py \

- 	CollectDebugInfoUsingLLDB.py \

- 	CompareDebugInfo.py \

- 	tools/get-report-time \

- 	FindMissingLineNo.py \

- 	MicroBenchmarks/libs/benchmark-1.3.0/tools/compare_bench.py

- 

  %setup -q -n %{clang_srcdir}

  

  %patch0 -p1 -b .lit-search-path
@@ -357,10 +321,6 @@ 

  # Add clang++-{version} sylink

  ln -s clang++ %{buildroot}%{_bindir}/clang++-%{maj_ver}

  

- # Install test suite

- mkdir -p %{buildroot}%{_datadir}/llvm-test-suite/

- cp -R %{_builddir}/%{test_suite_srcdir}/* %{buildroot}%{_datadir}/llvm-test-suite

- 

  %endif

  

  %check
@@ -441,11 +401,11 @@ 

  %files -n python2-clang

  %{python2_sitelib}/clang/

  

- %files -n llvm-test-suite

- %{_datadir}/llvm-test-suite/

- 

  %endif

  %changelog

+ * Wed Nov 21 2018 sguelton@redhat.com - 7.0.0-5

+ - Prune unneeded reference to llvm-test-suite sub-package

+ 

  * Mon Nov 19 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-5

  - Run 'make check-all' instead of 'make check-clang'

  

file removed
-48
@@ -1,48 +0,0 @@ 

- #!/bin/bash

- 

- set -ex

- tmpdir=`mktemp -d`

- currentdir=`pwd`

- 

- tar -C $tmpdir -xJf $1

- 

- test_suite_src=`echo $1 | cut -d . -f 1-4`

- pushd $tmpdir

- test -d $test_suite_src

- 

- 

- UNKNOWN="\

- 	MultiSource/Benchmarks/mediabench/ \

- 	MultiSource/Applications/JM/"

- 

- #MallocBench/{espresso,cfrac} might be OK

- BAD="\

- 	MultiSource/Benchmarks/MallocBench/ \

- 	MultiSource/Benchmarks/7zip/"

- 

- POSSIBLY_BAD="\

- 	MultiSource/Benchmarks/Olden/ \

- 	MultiSource/Benchmarks/Fhourstones/ \

- 	MultiSource/Benchmarks/ASCI_Purple/SMG2000/ \

- 	MultiSource/Benchmarks/Fhourstones-3.1/ \

- 	MultiSource/Benchmarks/McCat/ \

- 	MultiSource/Applications/spiff/"

- 

- #siod: llvm.org/PR38648

- BUGGY="\

- 	MultiSource/Applications/siod"

- 

- for f in $UNKNOWN $BAD $POSSIBLY_BAD $BUGGY; do

- 	test -d $test_suite_src/$f

- 	rm -Rf $test_suite_src/$f

- 	basedir=`dirname $f`

- 	dir=`basename $f`

- 	cmake_file=$test_suite_src/$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

- pushd

- rm -Rf $tmpdir

file modified
-1
@@ -1,3 +1,2 @@ 

  SHA512 (cfe-7.0.0.src.tar.xz) = 17a658032a0160c57d4dc23cb45a1516a897e0e2ba4ebff29472e471feca04c5b68cff351cdf231b42aab0cff587b84fe11b921d1ca7194a90e6485913d62cb7

- SHA512 (test-suite-7.0.0.src.fedora.tar.xz) = 2b3781cb53294bb4ccd65b9722ca4dd27ea762ceecde9a08780ca6152a4ce625994bc676b5a0d3459b77764e9ae372b2323f23fd25252a944328e66dc3502951

  SHA512 (clang-tools-extra-7.0.0.src.tar.xz) = 415c21823763b791bae6bbd31e71f1dc1231af60c248cf162764bbab6acac2ec75e223bd4766f5005dba27c96e3145fdd75475c630327dd9c75a0d604610084a