diff options
author | Björn Gustavsson <[email protected]> | 2016-12-16 12:33:17 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2016-12-16 12:33:17 +0100 |
commit | a795557a5c00ff31960434c2f5606476f3bb8a6e (patch) | |
tree | 8968db83921b3d1af5d952ebd2bba31aba7262c7 /lib/stdlib/test | |
parent | ceb0630a46556c16be180d189b6ba0177b07e266 (diff) | |
parent | e348250942a3d3fe1c96a6f2e1bfac9b442c9585 (diff) | |
download | otp-a795557a5c00ff31960434c2f5606476f3bb8a6e.tar.gz otp-a795557a5c00ff31960434c2f5606476f3bb8a6e.tar.bz2 otp-a795557a5c00ff31960434c2f5606476f3bb8a6e.zip |
Merge pull request #1275 from pjhades/fix/escript
Allow escripts with only two lines
OTP-14098
Diffstat (limited to 'lib/stdlib/test')
-rw-r--r-- | lib/stdlib/test/escript_SUITE.erl | 15 | ||||
-rwxr-xr-x | lib/stdlib/test/escript_SUITE_data/two_lines | 2 |
2 files changed, 16 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. diff --git a/lib/stdlib/test/escript_SUITE_data/two_lines b/lib/stdlib/test/escript_SUITE_data/two_lines new file mode 100755 index 0000000000..cf4e99639c --- /dev/null +++ b/lib/stdlib/test/escript_SUITE_data/two_lines @@ -0,0 +1,2 @@ +#! /usr/bin/env escript +main(MainArgs) -> io:format("main:~p\n", [MainArgs]), ErlArgs = init:get_arguments(), io:format("ERL_FLAGS=~p\n", [os:getenv("ERL_FLAGS")]), io:format("unknown:~p\n",[[E || E <- ErlArgs, element(1, E) =:= unknown]]). |