Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove terse property from report section #1825

Merged
merged 8 commits into from
Oct 14, 2024
4 changes: 0 additions & 4 deletions .github/workflows/nightly_regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ jobs:
if [ $returncode != 0 ]; then exit $returncode; fi
buildtest cdash upload --site=github nightly-$(date)

- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
timeout-minutes: 30

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/regression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
OS: ${{ matrix.os }}
shell: bash
run: |
if [ $OS = "ubuntu-latest" ] ; then sudo apt-get install -y csh tcsh zsh && sudo add-apt-repository ppa:kelleyk/emacs && sudo apt-get install -y emacs28; else brew install tcsh zsh emacs ; fi
if [ $OS = "ubuntu-latest" ] ; then sudo apt-get install -y csh tcsh zsh emacs; else brew install tcsh zsh emacs ; fi
cat /etc/shells
source setup.sh
pip install pytest
Expand All @@ -44,11 +44,6 @@ jobs:
if [ $returncode != 0 ]; then exit $returncode; fi
buildtest cdash upload --site=github unittests

- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
timeout-minutes: 30

- name: Upload coverage to Codecov
uses: codecov/codecov-action@v4
with:
Expand Down
6 changes: 0 additions & 6 deletions buildtest/cli/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -551,12 +551,6 @@ def print_report(
if count or count == 0:
self.count = count

terse = (
self.configuration.target_config["report"].get("terse")
if terse is None
else terse
)

consoleColor = checkColor(color)
tdata = [self.display_table[key] for key in self.display_table.keys()]
tdata = [list(i) for i in zip(*tdata)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ system:
terse: False
report:
count: 25
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
paths:
pbs: /usr/bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ system:

report:
count: 25
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
executors:
local:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ system:
format: "name,description"
# enable terse mode
terse: False

report:
count: 25
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
paths:
lsf: /usr/bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ system:
terse: False
report:
count: 25
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
paths:
pbs: /usr/bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ system:
terse: False
report:
count: 25
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
paths:
slurm: /usr/bin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ system:
terse: False
report:
count: 25
#enable terse mode for report
terse: False
format: "name,id,state,runtime,returncode"
paths:
torque: /usr/bin
Expand Down
1 change: 0 additions & 1 deletion buildtest/schemas/settings.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
"additionalProperties": false,
"description": "Specify configuration for ``buildtest report`` command",
"properties": {
"terse": { "$ref": "#/definitions/terse" },
"format": { "$ref": "#/definitions/format" },
"count": { "$ref": "#/definitions/count" }
}
Expand Down
1 change: 0 additions & 1 deletion buildtest/settings/aws.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ system:
- $BUILDTEST_ROOT/aws_tutorial
report:
count: 25
terse: false
format: name,id,state,runtime,returncode
executors:
local:
Expand Down
1 change: 0 additions & 1 deletion buildtest/settings/aws_oddc_pbs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ system:
- $BUILDTEST_ROOT/aws_oddc
report:
count: 25
terse: false
format: name,id,state,runtime,returncode
executors:
local:
Expand Down
3 changes: 1 addition & 2 deletions buildtest/settings/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ system:
report:
# number of records to display
count: 25
# display output in terse mode
terse: false

# specify format fields
format: name,id,state,runtime,returncode

Expand Down
3 changes: 1 addition & 2 deletions buildtest/settings/container_executor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ system:
report:
# number of records to display
count: 25
# display output in terse mode
terse: false

# specify format fields
format: name,id,state,runtime,returncode

Expand Down
1 change: 0 additions & 1 deletion buildtest/settings/spack_container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ system:
- $BUILDTEST_ROOT/examples
report:
count: 25
terse: false
format: name,id,state,runtime,returncode
executors:
local:
Expand Down
2 changes: 0 additions & 2 deletions tests/cli/configuration/container_executors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ system:
report:
# number of records to display
count: 25
# display output in terse mode
terse: false
# specify format fields
format: name,id,state,runtime,returncode

Expand Down
1 change: 0 additions & 1 deletion tests/cli/configuration/invalid_executors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ system:
terse: False
report:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
executors:
local:
Expand Down
1 change: 0 additions & 1 deletion tests/cli/test_compilers/invalid_moduletool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ system:
terse: False
report:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
executors:
local:
Expand Down
1 change: 0 additions & 1 deletion tests/cli/test_compilers/missing_compiler_find.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ system:
terse: False
report:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
executors:
local:
Expand Down
3 changes: 1 addition & 2 deletions tests/settings/invalid/torque_invalid_executor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ system:
count: 15
format: name,description
terse: false
root:
search:
- $BUILDTEST_ROOT/aws_oddc
report:
count: 25
terse: false
format: name,id,state,runtime,returncode
executors:
local:
Expand Down
1 change: 0 additions & 1 deletion tests/settings/nersc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ system:
terse: False
report:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
compilers:
enable_prgenv: true
Expand Down
1 change: 0 additions & 1 deletion tests/settings/pbs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ system:
terse: False
report:
count: 25
terse: False
format: "name,id,state,runtime,returncode"
executors:
defaults:
Expand Down
1 change: 0 additions & 1 deletion tests/settings/summit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ system:
terse: false
report:
count: 25
terse: false
format: name,id,state,runtime,returncode
executors:
defaults:
Expand Down
3 changes: 1 addition & 2 deletions tests/settings/torque.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@ system:
count: 15
format: name,description
terse: false
directory:
search:
- $BUILDTEST_ROOT/aws_oddc
report:
count: 25
terse: false
format: name,id,state,runtime,returncode
executors:
local:
Expand Down
Loading