diff options
author | Björn Gustavsson <[email protected]> | 2013-12-19 10:15:40 +0100 |
---|---|---|
committer | Björn Gustavsson <[email protected]> | 2013-12-19 10:15:40 +0100 |
commit | 7fcde0281c04170595d437dc0480f4cd690c6fde (patch) | |
tree | 353cf81814416569c645236a20fa2f8daff6d94f /lib/compiler/test/compile_SUITE.erl | |
parent | 3ee4bd41cdebf355447571fc9cb10b4fe5132ad9 (diff) | |
parent | 455c8238535d2754234cd68bbf7caba9960607d6 (diff) | |
download | otp-7fcde0281c04170595d437dc0480f4cd690c6fde.tar.gz otp-7fcde0281c04170595d437dc0480f4cd690c6fde.tar.bz2 otp-7fcde0281c04170595d437dc0480f4cd690c6fde.zip |
Merge branch 'ta/compiler/asm-core/OTP-11547'
* ta/compiler/asm-core/OTP-11547:
Officially support building core files
Officially support building assembler files
Diffstat (limited to 'lib/compiler/test/compile_SUITE.erl')
-rw-r--r-- | lib/compiler/test/compile_SUITE.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl index 1dc1ddb653..4ec75d015e 100644 --- a/lib/compiler/test/compile_SUITE.erl +++ b/lib/compiler/test/compile_SUITE.erl @@ -769,8 +769,8 @@ do_core({M,A}, Outdir) -> error end. -%% Compile to Beam assembly language (.S) and the try to -%% run .S throught the compiler again. +%% Compile to Beam assembly language (.S) and then try to +%% run .S through the compiler again. asm(Config) when is_list(Config) -> ?line Dog = test_server:timetrap(test_server:minutes(20)), |