Skip to content

Re-enable tests, and make (most of) them pass #10

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.

Sign up for GitHub

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

Open
eric-wieser wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Re-enable tests, and make (most of) them pass #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
735264d
Make metadata optional. Most tests now pass.
eric-wieser Nov 2, 2015
5e691be
Make editor optional. Include tests now pass
eric-wieser Nov 2, 2015
9eba661
Fix checksums in verifier tests
eric-wieser Nov 3, 2015
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: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ module.exports = function(grunt) {
grunt.registerTask('workbook', ['bsim_workbook','tmsim_workbook']);
grunt.registerTask('edx', ['bsim_edx','tmsim_edx']);

//grunt.registerTask('test', ['connect', 'qunit:all'])
grunt.registerTask('test', ['connect', 'qunit:all'])

// Builds everything if just called as 'grunt'
grunt.registerTask('default', ['bsim','jsim','tmsim']);
Expand Down
13 changes: 13 additions & 0 deletions bsim/assemble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,13 @@
var mParsedFiles = {};
var mPendingIncludes = [];

// allow an assembler to be constructed independantly of an editor
if (editor === undefined) {
editor = {
getFile: function() { return FileSystem.getFile.apply(FileSystem, arguments); }
}
}

// Parses a macro definition
var parse_macro = function(stream) {
var macro_name = readSymbol(stream);
Expand Down Expand Up @@ -1116,6 +1123,12 @@
//var can_succeed = true;
var errors = [];

// metadata is optional
if(callback === undefined) {
callback = metadata;
metadata = null;
}

sources = []; // initialize list of sources
parse_file(file, content, function(syntax) {
var code;
Expand Down
2 changes: 1 addition & 1 deletion bsim/tests/assemble.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,6 @@ test(".pcheckoff works", function() {
});

assembler.assemble("t.uasm", '.pcheckoff "some url" "some name" 42\n.verify 0x20 8 0x73657420 0x2e2e2e74 0xa 0x20000000 0x73ff0143 0xc15f04e0 0x42ff04e1 0xd2370056', function(success, result) {
equal(result.checkoff.running_checksum, -2102874770, "Negative checksum is calculated correctly.");
equal(result.checkoff.running_checksum, -2102874768, "Negative checksum is calculated correctly.");
});
});
2 changes: 1 addition & 1 deletion bsim/tests/verifier.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module("Verifiers");
test("TextVerifier", function() {
var beta = new FakeBeta();

var verifier = new BSim.TextVerifier(beta, {checksum: -318887899});
var verifier = new BSim.TextVerifier(beta, {checksum: -318887901});
ok(!verifier.verify(), "Verification fails on un-run beta.");
ok(/no simulation results/i.test(verifier.getMessage()), "Failed with no simulation results message.");
beta.setCycleCount(1);
Expand Down