diff options
| author | Jing Peng <[email protected]> | 2016-12-09 21:42:45 -0500 |
|---|---|---|
| committer | Jing Peng <[email protected]> | 2016-12-13 21:09:38 -0500 |
| commit | e348250942a3d3fe1c96a6f2e1bfac9b442c9585 (patch) | |
| tree | 35e99520f27100fe78751358cfb482caec7dade8 /lib/stdlib/test/escript_SUITE.erl | |
| parent | b47d104994c6f11301f23b0675ed5f06f3e25922 (diff) | |
| download | otp-e348250942a3d3fe1c96a6f2e1bfac9b442c9585.tar.gz otp-e348250942a3d3fe1c96a6f2e1bfac9b442c9585.tar.bz2 otp-e348250942a3d3fe1c96a6f2e1bfac9b442c9585.zip | |
Allow escripts with only two lines
The current implementation assumes that escripts all have at least
three lines. But according to the escript documentation, comments
on the second line and emulator flags on the third line are all
optional. Thus escripts with only two lines -- shebang on the
first line and code on the second line -- will not run. This commit
fixes the problem by rearranging the escript header parsing logic,
and recognize the escript body on the second line if the header only
contains a line of shebang.
Diffstat (limited to 'lib/stdlib/test/escript_SUITE.erl')
| -rw-r--r-- | lib/stdlib/test/escript_SUITE.erl | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/stdlib/test/escript_SUITE.erl b/lib/stdlib/test/escript_SUITE.erl index 28d69232a0..0b9106a99c 100644 --- a/lib/stdlib/test/escript_SUITE.erl +++ b/lib/stdlib/test/escript_SUITE.erl @@ -28,6 +28,7 @@ strange_name/1, emulator_flags/1, emulator_flags_no_shebang/1, + two_lines/1, module_script/1, beam_script/1, archive_script/1, @@ -49,7 +50,7 @@ suite() -> all() -> [basic, errors, strange_name, emulator_flags, - emulator_flags_no_shebang, + emulator_flags_no_shebang, two_lines, module_script, beam_script, archive_script, epp, create_and_extract, foldl, overflow, archive_script_file_access, unicode]. @@ -153,6 +154,18 @@ emulator_flags(Config) when is_list(Config) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +two_lines(Config) when is_list(Config) -> + Data = proplists:get_value(data_dir, Config), + Dir = filename:absname(Data), %Get rid of trailing slash. + run(Dir, "two_lines -arg1 arg2 arg3", + [<<"main:[\"-arg1\",\"arg2\",\"arg3\"]\n" + "ERL_FLAGS=false\n" + "unknown:[]\n" + "ExitCode:0">>]), + ok. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + emulator_flags_no_shebang(Config) when is_list(Config) -> Data = proplists:get_value(data_dir, Config), Dir = filename:absname(Data), %Get rid of trailing slash. |