@@ -102,6 +102,7 @@ if {$argc > 1} {
102102if {[catch {
103103
104104set exitcode 0
105+ set instdir /tmp/mods+test-install
105106set rpmbuilddir $env(HOME) /rpmbuild
106107set srpmdir $rpmbuilddir /SRPMS
107108set rpmdir $rpmbuilddir /RPMS/$tcl_platform(machine)
@@ -176,7 +177,7 @@ set ghexporturl https://github.com/$ghremtgt/archive/$reltag.tar.gz
176177
177178# clean previous release files
178179file delete -force /tmp/mods+test-gz /tmp/mods+test-bz2 /tmp/mods+test-clone\
179- /tmp/mods+test-export
180+ /tmp/mods+test-export $instdir
180181file mkdir /tmp/mods+test-gz /tmp/mods+test-bz2 /tmp/mods+test-clone\
181182 /tmp/mods+test-export
182183reportInfo {Recreate test directory /tmp/mods+test-gz and /tmp/mods+test-bz2\
@@ -287,77 +288,67 @@ quitorcont
287288runcmd 2>@$logfid git push --force $gh_test_remote c-3.2
288289runcmd 2>@$logfid git push --force $gh_test_remote $relbranch
289290runcmd 2>@$logfid git push --force $gh_test_remote $reltag
290- # see Phase 7 for CI result check
291-
292-
293- # Phase 3: build, test, install from git repository
294- # ---------------------------------------------------------
295-
296- runcmd make
297- runcmd script/mt
298- runcmd 2>@$logfid sudo make install
299- runcmd script/mt install
300- runcmd 2>@$logfid sudo make uninstall
291+ # see Phase 6 for CI result check
301292
302293
303- # Phase 4 : build, test, install from generated dists
294+ # Phase 3 : build, test, install from generated dists
304295# ---------------------------------------------------------
305296
306297cd /tmp/mods+test-gz
307298runcmd tar xfz $cwd /$distgz
308299cd modules-$relver
309300reportInfo " Moved into '[ pwd ] ' directory"
310- runcmd ./configure
301+ runcmd ./configure --prefix= $instdir
311302runcmd make
312303runcmd 2>@$logfid script/mt
313- runcmd 2>@$logfid sudo make install
304+ runcmd 2>@$logfid make install
314305runcmd script/mt install
315- runcmd 2>@$logfid sudo make uninstall
306+ runcmd 2>@$logfid make uninstall
316307runcmd make clean
317308
318309cd /tmp/mods+test-bz2
319310runcmd tar xfj $cwd /$distbz
320311cd modules-$relver
321312reportInfo " Moved into '[ pwd ] ' directory"
322- runcmd ./configure
313+ runcmd ./configure --prefix= $instdir
323314runcmd make
324315runcmd 2>@$logfid script/mt
325- runcmd 2>@$logfid sudo make install
316+ runcmd 2>@$logfid make install
326317runcmd script/mt install
327- runcmd 2>@$logfid sudo make uninstall
318+ runcmd 2>@$logfid make uninstall
328319runcmd make clean
329320
330321cd /tmp/mods+test-clone
331322runcmd 2>@$logfid git clone $ghcloneurl
332323cd modules
333324reportInfo " Moved into '[ pwd ] ' directory"
334325runcmd 2>@$logfid git checkout $relbranch
335- runcmd 2>@$logfid ./configure
326+ runcmd 2>@$logfid ./configure --prefix= $instdir
336327runcmd make
337328runcmd 2>@$logfid script/mt quick
338- runcmd 2>@$logfid sudo make install
329+ runcmd 2>@$logfid make install
339330runcmd script/mt install
340- runcmd 2>@$logfid sudo make uninstall
331+ runcmd 2>@$logfid make uninstall
341332runcmd make clean
342333
343334cd /tmp/mods+test-export
344335runcmd 2>@$logfid wget -O $reltag .tar.gz $ghexporturl
345336runcmd tar xfz $reltag .tar.gz
346337cd modules-$relver
347338reportInfo " Moved into '[ pwd ] ' directory"
348- runcmd ./configure
339+ runcmd ./configure --prefix= $instdir
349340runcmd make
350341runcmd 2>@$logfid script/mt quick
351- runcmd 2>@$logfid sudo make install
342+ runcmd 2>@$logfid make install
352343runcmd script/mt install
353- runcmd 2>@$logfid sudo make uninstall
344+ runcmd 2>@$logfid make uninstall
354345runcmd make clean
355346
356347cd $cwd
357348reportInfo " Moved back into '[ pwd ] ' directory"
358349
359350
360- # Phase 5 : build, test, install from RPM built locally
351+ # Phase 4 : build, test, install from RPM built locally
361352# ---------------------------------------------------------
362353
363354runcmd 2>@$logfid rpmbuild --rebuild $srcrpm
@@ -369,7 +360,7 @@ foreach rpmpkg [glob $rpmdir/environment-modules-$rpmrelver.*.rpm] {
369360}
370361
371362
372- # Phase 6 : build and test on Fedora platform
363+ # Phase 5 : build and test on Fedora platform
373364# ---------------------------------------------------------
374365
375366# get list of targets
@@ -438,7 +429,7 @@ while {[array size koji_tasks]} {
438429}
439430
440431
441- # Phase 7 : verify CI result
432+ # Phase 6 : verify CI result
442433# ---------------------------------------------------------
443434
444435reportInfo " Checking CI tests status on $ghstatusurl "
0 commit comments