tests/boost-testsuite-sanity: adapt to rpm package > 4.18.91, use the proper rpm macro value to determine the required path
This commit is contained in:
		
							parent
							
								
									bffabb9a28
								
							
						
					
					
						commit
						a9ff19d2d3
					
				| @ -54,9 +54,11 @@ rlJournalStart | ||||
|   rlPhaseStartSetup "build boost" | ||||
|     rlRun "rpm -D \"_topdir $TmpDir\" -U *.src.rpm" | ||||
|     rlRun "dnf builddep -y $TmpDir/SPECS/*.spec" | ||||
|     rlRun "sed -i -e 's/^%prep/%prep\n%dump/' $TmpDir/SPECS/*.spec" | ||||
|     rlRun "su -c 'rpmbuild -D \"_topdir $TmpDir\" -bp $TmpDir/SPECS/*.spec &>$TmpDir/rpmbuild.log' $BUILD_USER" | ||||
|     rlRun "rlFileSubmit $TmpDir/rpmbuild.log" | ||||
|     rlRun "cd $TmpDir/BUILD/boost*" | ||||
|     rlRun "toplev_dirname=`awk '/toplev_dirname/{print $3; exit}' $TmpDir/rpmbuild.log`" | ||||
|     rlRun "cd $TmpDir/BUILD/$toplev_dirname" | ||||
|     rlRun "su -c './bootstrap.sh &>$TmpDir/bootstrap.log' $BUILD_USER" | ||||
|     rlRun "rlFileSubmit $TmpDir/bootstrap.log" | ||||
|   rlPhaseEnd | ||||
| @ -64,7 +66,7 @@ rlJournalStart | ||||
|   rlPhaseStartTest "run testsuite" | ||||
|     while read test_path; do | ||||
|       if [ -f $TmpDir/BUILD/boost*/libs/$test_path/test/Jamfile* ]; then | ||||
|         rlRun "cd $TmpDir/BUILD/boost*/libs/$test_path/test" | ||||
|         rlRun "cd $TmpDir/BUILD/$toplev_dirname/libs/$test_path/test" | ||||
|         rlRun "su -c '/usr/bin/b2 -d1 --build-dir=$TmpDir/test-build &>>$TmpDir/testsuite.log' $BUILD_USER" | ||||
|         rm -fr $TmpDir/test-build | ||||
|       else | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user