Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/cdash/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,8 @@ add_browser_test(/Browser/Pages/BuildNotesPageTest)

add_browser_test(/Browser/Pages/BuildTargetsPageTest)

add_browser_test(/Browser/Pages/BuildInstrumentationPageTest)

add_browser_test(/Browser/Pages/BuildTestsPageTest)

add_browser_test(/Browser/Pages/BuildConfigurePageTest)
Expand Down
4 changes: 4 additions & 0 deletions resources/js/vue/components/BuildInstrumentationPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import FilterBuilder from './shared/FilterBuilder.vue';
import CommandFlameChart from './shared/CommandFlameChart.vue';
import { DateTime, Duration } from 'luxon';
import LineChart from './shared/Charts/LineChart.vue';
import Utils from './shared/Utils';

export default {
name: 'BuildInstrumentationPage',
Expand Down Expand Up @@ -104,6 +105,7 @@ export default {
edges {
node {
name
type
value
}
}
Expand Down Expand Up @@ -133,6 +135,7 @@ export default {
edges {
node {
name
type
value
}
}
Expand Down Expand Up @@ -249,6 +252,7 @@ export default {
language: edge.node.language,
config: edge.node.config,
disabled: !this.visibleCommandIds.has(edge.node.id),
measurements: Utils.numericMeasurements(edge.node.measurements.edges.map(({ node }) => node)),
};
});
},
Expand Down
29 changes: 11 additions & 18 deletions resources/js/vue/components/BuildTestsPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ import LoadingIndicator from './shared/LoadingIndicator.vue';
import BuildSummaryCard from './shared/BuildSummaryCard.vue';
import BuildSidebar from './shared/BuildSidebar.vue';
import TestFlameChart from './shared/TestFlameChart.vue';
import Utils from './shared/Utils';
import { DateTime, Duration } from 'luxon';
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
import { faChartGantt } from '@fortawesome/free-solid-svg-icons';
Expand Down Expand Up @@ -342,24 +343,16 @@ export default {
return [];
}

return this.executedTests.filter((test) => test.node.startTime).map((test) => {
const numericMeasurements = test.node.testMeasurements
.filter((measurement) => measurement.type.startsWith('numeric'))
.map((measurement) => ({ name: measurement.name, value: parseFloat(measurement.value) }));
const maxRssMeasurement = numericMeasurements.find((measurement) => measurement.name === 'MaxRSS');

return {
id: test.node.id,
name: test.node.name,
startTime: DateTime.fromISO(test.node.startTime),
duration: Duration.fromObject({ seconds: test.node.runningTime }),
status: test.node.status,
subProject: test.subProject,
disabled: !this.visibleTestIds.has(test.node.id),
maxRss: maxRssMeasurement ? maxRssMeasurement.value : null,
numericMeasurements,
};
});
return this.executedTests.filter((test) => test.node.startTime).map((test) => ({
id: test.node.id,
name: test.node.name,
startTime: DateTime.fromISO(test.node.startTime),
duration: Duration.fromObject({ seconds: test.node.runningTime }),
status: test.node.status,
subProject: test.subProject,
disabled: !this.visibleTestIds.has(test.node.id),
measurements: Utils.numericMeasurements(test.node.testMeasurements),
}));
},

pinnedMeasurementColumns() {
Expand Down
Loading
Loading