Skip to content
This repository has been archived by the owner on Nov 10, 2017. It is now read-only.

initial work to get compare-talos stood up inside of perfherder #465

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 37 additions & 2 deletions Gruntfile.js
Expand Up @@ -51,9 +51,17 @@ module.exports = function(grunt) {
dest:'dist'
}
},
compare: {
src:'webapp/app/compare.html',
nonull: true,
options:{
dest:'dist'
}
},
},

usemin:{ html:['dist/index.html', 'dist/help.html', 'dist/logviewer.html', 'dist/perf.html'] },
usemin:{ html:['dist/index.html', 'dist/help.html', 'dist/logviewer.html',
'dist/perf.html', 'dist/compare.html'] },

'cache-busting': {
indexjs: {
Expand All @@ -74,6 +82,12 @@ module.exports = function(grunt) {
file: 'dist/js/perf.min.js',
cleanup: true
},
comparejs: {
replace: ['dist/**/*.html'],
replacement: 'compare.min.js',
file: 'dist/js/compare.min.js',
cleanup: true
},
indexcss: {
replace: ['dist/**/*.html'],
replacement: 'index.min.css',
Expand Down Expand Up @@ -107,7 +121,8 @@ module.exports = function(grunt) {
{ src:'webapp/app/index.html', dest:'dist/index.html', nonull: true },
{ src:'webapp/app/help.html', dest:'dist/help.html', nonull: true },
{ src:'webapp/app/logviewer.html', dest:'dist/logviewer.html', nonull: true },
{ src:'webapp/app/perf.html', dest:'dist/perf.html', nonull: true }
{ src:'webapp/app/perf.html', dest:'dist/perf.html', nonull: true },
{ src:'webapp/app/compare.html', dest:'dist/compare.html', nonull: true }
]
},
// Copy img dir
Expand Down Expand Up @@ -215,6 +230,26 @@ module.exports = function(grunt) {
keepClosingSlash: true
}
}
},
compare: {
cwd: 'webapp/app',
src: 'partials/perf/*.html',
dest: 'dist/js/compare.min.js',
options: {
usemin: 'dist/js/compare.min.js',
append: true,
htmlmin: {
collapseBooleanAttributes: true,
collapseWhitespace: true,
removeAttributeQuotes: true,
removeComments: true,
removeEmptyAttributes: true,
removeRedundantAttributes: true,
removeScriptTypeAttributes: true,
removeStyleLinkTypeAttributes: true,
keepClosingSlash: true
}
}
}
}
});
Expand Down
40 changes: 40 additions & 0 deletions webapp/app/compareperf.html
@@ -0,0 +1,40 @@
<!DOCTYPE html>
<html ng-app="compare">
<head>
<meta charset="iso-8859-1" />
<title>Compare Performance</title>
<!-- build:css css/perf.min.css -->
<link href="css/bootstrap.css" rel="stylesheet" media="screen">
<link href="css/perf.css" rel="stylesheet" media="screen">
<!-- endbuild -->
<link id="favicon" type="image/png" rel="shortcut icon" href="img/tree_open.png">
<style>
</style>
</head>
<body>

<section ui-view>
</section>

<script src="js/config/local.conf.js"></script>

<!-- build:js js/compare.min.js -->
<script src="vendor/jquery-2.0.3.js"></script>
<script src="vendor/underscore-min.js"></script>
<script src="vendor/angular/angular.js"></script>
<script src="vendor/angular/angular-route.js"></script>
<script src="vendor/angular/angular-resource.js"></script>
<script src="vendor/angular/angular-cookies.js"></script>
<script src="vendor/angular/angular-ui-router.js"></script>
<script src="vendor/angular/angular-sanitize.min.js"></script>
<script src="vendor/angular-local-storage.min.js"></script>
<script src="vendor/ui-bootstrap-tpls-0.11.2.min.js"></script>
<script src="vendor/bootstrap.js"></script>
<script src="vendor/mousetrap.min.js"></script>
<script src="js/treeherder.js"></script>
<script src="js/providers.js"></script>
<script src="js/compareperf.js"></script>
<!-- endbuild -->

</body>
</html>
35 changes: 35 additions & 0 deletions webapp/app/css/perf.css
Expand Up @@ -165,9 +165,32 @@ to { opacity: 0; }
}


.subtest-header {
background-image: linear-gradient(to bottom, #6A7B86, #424F5A);
color: white;
font-weight: bold;
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blank lines between CSS declarations plz.


.subtest-improvement {
background-color: green;
color: white;
font-weight: bold;
}

.subtest-regression {
background-color: red;
color: white;
font-weight: bold;
}

.subtest-empty {
display: none;
}

.subtest-result button {
display: none;
}

.subtest-result:hover button {
display: inline-block;
}
Expand All @@ -178,3 +201,15 @@ to { opacity: 0; }
text-overflow: ellipsis;
overflow: hidden;
}

.compare-improvement {
background-color: green;
color: white;
font-weight: bold;
}

.compare-regression {
background-color: red;
color: white;
font-weight: bold;
}
Binary file added webapp/app/img/dancing_cat.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.