diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-10 18:40:20 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-10 18:40:20 +0100 |
| commit | 7dd82c1674132e0c6ea9f81bed9b142f8d4fbd7e (patch) | |
| tree | c53c988a40486f4758f34fa76e011d21894cdcab /cpu/os.asm | |
| parent | 7a2e8c69cb4a4407261f11dd36374273d1fc5a28 (diff) | |
| parent | cc00abd9e33a00d3c7acfe310bf8d6522e9a1888 (diff) | |
| download | SystDigit-Projet-7dd82c1674132e0c6ea9f81bed9b142f8d4fbd7e.tar.gz SystDigit-Projet-7dd82c1674132e0c6ea9f81bed9b142f8d4fbd7e.zip | |
Merge branch 'emile'
Conflicts:
asm/asmpars.mly
Diffstat (limited to 'cpu/os.asm')
| -rw-r--r-- | cpu/os.asm | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -225,9 +225,9 @@ error: # For unit-tests testlist: - word unit_test_0 unit_test_1 unit_test_2 unit_test_3 0; + word unit_test_0 unit_test_1 unit_test_2 unit_test_3 0 teststr: - word test0 test1 test2 test3 0; + word test0 test1 test2 test3 0 testbegin: ascii "Runing CPU unit tests...\n" testok: |