Remove Beaker conflicting env variable from benchmark tests
This commit is contained in:
parent
1e2cdf9089
commit
18199d5b56
28
pegasus-2.14.1-tesid.patch
Normal file
28
pegasus-2.14.1-tesid.patch
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
diff -up pegasus/src/Clients/benchmarkTest/Load/Makefile.orig pegasus/src/Clients/benchmarkTest/Load/Makefile
|
||||||
|
--- pegasus/src/Clients/benchmarkTest/Load/Makefile.orig 2015-10-12 13:19:57.029090805 +0200
|
||||||
|
+++ pegasus/src/Clients/benchmarkTest/Load/Makefile 2015-10-12 13:20:43.379003285 +0200
|
||||||
|
@@ -33,11 +33,7 @@ include $(ROOT)/mak/configschema.mak
|
||||||
|
include $(ROOT)/mak/test.mak
|
||||||
|
include $(ROOT)/mak/commands.mak
|
||||||
|
|
||||||
|
-ifdef TESTID
|
||||||
|
- BenchmarkMOF_NAME = benchmarkProvider_$(TESTID)
|
||||||
|
-else
|
||||||
|
- BenchmarkMOF_NAME = benchmarkProvider
|
||||||
|
-endif
|
||||||
|
+BenchmarkMOF_NAME = benchmarkProvider
|
||||||
|
|
||||||
|
PROVIDERNS=root/benchmark
|
||||||
|
PROVIDERNSDIRECTORY=$(REPOSITORY_ROOT)/root\#benchmark
|
||||||
|
@@ -74,11 +70,7 @@ unregisterproviders:
|
||||||
|
changeconfig:
|
||||||
|
$(MAKE) -i cimstart
|
||||||
|
$(MAKE) unregister
|
||||||
|
-ifdef TESTID
|
||||||
|
- $(MAKE) repositoryServer TESTID=$(TESTID)
|
||||||
|
-else
|
||||||
|
$(MAKE) repositoryServer
|
||||||
|
-endif
|
||||||
|
|
||||||
|
|
||||||
|
depend:
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
Name: tog-pegasus
|
Name: tog-pegasus
|
||||||
Version: %{major_ver}.1
|
Version: %{major_ver}.1
|
||||||
Release: 33%{?dist}
|
Release: 34%{?dist}
|
||||||
Epoch: 2
|
Epoch: 2
|
||||||
Summary: OpenPegasus WBEM Services for Linux
|
Summary: OpenPegasus WBEM Services for Linux
|
||||||
|
|
||||||
@ -92,6 +92,8 @@ Patch37: pegasus-2.14.1-fix-setup-sdk.patch
|
|||||||
Patch38: pegasus-2.14.1-cimconfig-man-page-fixes.patch
|
Patch38: pegasus-2.14.1-cimconfig-man-page-fixes.patch
|
||||||
# 39: fixes setupSDK in -devel for ppc64le
|
# 39: fixes setupSDK in -devel for ppc64le
|
||||||
Patch39: pegasus-2.14.1-fix-setup-sdk-ppc64le.patch
|
Patch39: pegasus-2.14.1-fix-setup-sdk-ppc64le.patch
|
||||||
|
# 40: removes Beaker conflicting env variable
|
||||||
|
Patch40: pegasus-2.14.1-tesid.patch
|
||||||
|
|
||||||
BuildRequires: procps, libstdc++, pam-devel
|
BuildRequires: procps, libstdc++, pam-devel
|
||||||
BuildRequires: openssl, openssl-devel
|
BuildRequires: openssl, openssl-devel
|
||||||
@ -242,6 +244,7 @@ yes | mak/CreateDmtfSchema 238 %{SOURCE9} cim_schema_2.38.0
|
|||||||
%patch37 -p1 -b .fix-setup-sdk
|
%patch37 -p1 -b .fix-setup-sdk
|
||||||
%patch38 -p1 -b .cimconfig-man-page-fixes
|
%patch38 -p1 -b .cimconfig-man-page-fixes
|
||||||
%patch39 -p1 -b .fix-setup-sdk-ppc64le
|
%patch39 -p1 -b .fix-setup-sdk-ppc64le
|
||||||
|
%patch40 -p1 -b .testid
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -533,6 +536,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 12 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-34
|
||||||
|
- Remove Beaker conflicting env variable from benchmark tests
|
||||||
|
|
||||||
* Tue Oct 06 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-33
|
* Tue Oct 06 2015 Vitezslav Crhonek <vcrhonek@redhat.com> - 2:2.14.1-33
|
||||||
- Fix setupSDK in -devel for ppc64le
|
- Fix setupSDK in -devel for ppc64le
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user