Skip to content

Commit

Permalink
remove explicit parallelism in make calls
Browse files Browse the repository at this point in the history
  • Loading branch information
berquist committed Aug 29, 2024
1 parent 2574c98 commit 07a17eb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 13 deletions.
16 changes: 8 additions & 8 deletions buildsys/bamboo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1278,8 +1278,8 @@ config_and_build() {
echo ' '
echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"

echo "=== Running make -j4 all ==="
make -j4 all
echo "=== Running make all ==="
make all
retval=$?
if [ $retval -ne 0 ]
then
Expand All @@ -1299,8 +1299,8 @@ config_and_build() {
echo ' '
echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"

echo "=== Running make -j4 install ==="
make -j4 install
echo "=== Running make install ==="
make install
retval=$?
if [ $retval -ne 0 ]
then
Expand Down Expand Up @@ -1385,8 +1385,8 @@ config_and_build_simple() {
echo ' '
echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"

echo "=== Running make -j4 ==="
make -j4
echo "=== Running make ==="
make
retval=$?
if [ $retval -ne 0 ]
then
Expand All @@ -1406,8 +1406,8 @@ config_and_build_simple() {
echo ' '
echo "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"

echo "=== Running make -j4 install ==="
make -j4 install
echo "=== Running make install ==="
make install
retval=$?;
if [ $retval -ne 0 ]
then
Expand Down
2 changes: 1 addition & 1 deletion buildsys/deps/bin/sstDep_dramsim3_stabledevel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ sstDepsDeploy_dramsim3 ()
return $retval
fi

make -j4
make

retval=$?
if [ $retval -ne 0 ]
Expand Down
6 changes: 2 additions & 4 deletions test/testSuites/testSuite_macro.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ test_macro_make_check() {
then
# Run SUT
# (make ${sutArgs} > $outFile)
# TODO parameterize number of build threads
(make -j4 ${sutArgs})
(make ${sutArgs})
RetVal=$?
local TIME_FLAG=$SSTTESTTEMPFILES/TimeFlag_$$_${__timerChild}
if [ -e $TIME_FLAG ] ; then
Expand Down Expand Up @@ -149,8 +148,7 @@ test_macro_make_installcheck() {
then
# Run SUT
# (make ${sutArgs} > $outFile)
# TODO parameterize number of build threads
(make -j4 ${sutArgs})
(make ${sutArgs})
RetVal=$?
local TIME_FLAG=$SSTTESTTEMPFILES/TimeFlag_$$_${__timerChild}
if [ -e $TIME_FLAG ] ; then
Expand Down

0 comments on commit 07a17eb

Please sign in to comment.