Skip to content

Commit

Permalink
Enable heart on tests; align files more with nerves.new
Browse files Browse the repository at this point in the history
  • Loading branch information
fhunleth committed Mar 16, 2018
1 parent 3b0dd77 commit 8873e08
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 26 deletions.
23 changes: 14 additions & 9 deletions test/.gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# App artifacts
/_build
/db
/deps
/*.ez
# The directory Mix will write compiled artifacts to.
/_build/

# Nerves artifacts
/_images
/.nerves
# If you run "mix test --cover", coverage assets end up here.
/cover/

# Generate on crash by the VM
# The directory Mix downloads your dependencies sources to.
/deps/

# Where 3rd-party dependencies like ExDoc output generated docs.
/doc/

# Ignore .fetch files in case you like to edit your project deps locally.
/.fetch

# If the VM crashes, it generates a dump, let's ignore it too.
erl_crash.dump
17 changes: 3 additions & 14 deletions test/mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if Mix.env() == :test do
System.put_env("NERVES_FW_VCS_IDENTIFIER", hash)
end

defmodule Test.Mixfile do
defmodule Test.MixProject do
use Mix.Project

def project do
Expand All @@ -16,16 +16,13 @@ defmodule Test.Mixfile do
version: "0.1.0",
elixir: "~> 1.4",
archives: [nerves_bootstrap: "~> 1.0-rc"],
build_embedded: Mix.env() == :prod,
start_permanent: Mix.env() == :prod,
aliases: [loadconfig: [&bootstrap/1]],
deps: deps()
]
end

# Configuration for the OTP application.
#
# Type `mix help compile.app` for more information.
# Type `mix help compile.app` to learn about applications.
def application, do: []

defp bootstrap(args) do
Expand All @@ -34,15 +31,7 @@ defmodule Test.Mixfile do
Mix.Task.run("loadconfig", args)
end

# Dependencies can be Hex packages:
#
# {:my_dep, "~> 0.3.0"}
#
# Or git/path repositories:
#
# {:my_dep, git: "https://github.com/elixir-lang/my_dep.git", tag: "0.1.0"}
#
# Type "mix help deps" for more examples and options
# Run "mix help deps" to learn about dependencies.
defp deps do
[
{:nerves_system_rpi3, path: "../", runtime: false},
Expand Down
1 change: 0 additions & 1 deletion test/mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"nerves_system_linter": {:hex, :nerves_system_linter, "0.3.0", "84e0f63c8ac196b16b77608bbe7df66dcf352845c4e4fb394bffd2b572025413", [:mix], [], "hexpm"},
"nerves_system_test": {:git, "https://github.com/nerves-project/nerves_system_test.git", "e2c1b8efb0eb2ae5ed80d48dd3f11fcb1022a68a", []},
"nerves_toolchain_arm_unknown_linux_gnueabihf": {:hex, :nerves_toolchain_arm_unknown_linux_gnueabihf, "1.0.0-rc.0", "978ce20c1a819d68d25f4968e12af39b342960bcb98a541ccdae981e74848acf", [:mix], [{:nerves, "~> 1.0-rc", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.4-rc", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_toolchain_armv6_rpi_linux_gnueabi": {:hex, :nerves_toolchain_armv6_rpi_linux_gnueabi, "0.11.0", "74ee72f15baffe773e41bae1baeef3942fc8f97fa47d9d1bf9db07c17eca90bd", [:mix], [{:nerves, "~> 0.7", [hex: :nerves, repo: "hexpm", optional: false]}, {:nerves_toolchain_ctng, "~> 1.1", [hex: :nerves_toolchain_ctng, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_toolchain_ctng": {:hex, :nerves_toolchain_ctng, "1.4.0-rc.0", "1766752c2a854af5e0f102892d947f787f8f47ee500f564e7fdb50c4d1c4789c", [:mix], [{:nerves, "~> 1.0-rc", [hex: :nerves, repo: "hexpm", optional: false]}], "hexpm"},
"nerves_watchdog": {:git, "https://github.com/mobileoverlord/nerves_watchdog.git", "660f5de7d075ad41c5a0a0dcade073712087b4e7", []},
"nerves_wpa_supplicant": {:hex, :nerves_wpa_supplicant, "0.3.2", "19dc7e1248336e7f542b11b2b857ceb5b088d3eb41a6ca75b7b76628dcf67aad", [:make, :mix], [{:elixir_make, "~> 0.3", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm"},
Expand Down
15 changes: 13 additions & 2 deletions test/rel/vm.args
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,22 @@
## See http://erlang.org/doc/man/kernel_app.html for additional options
-kernel shell_history enabled

## Enable heartbeat monitoring of the Erlang runtime system
-heart -env HEART_BEAT_TIMEOUT 30

## Start the Elixir shell

-noshell
-user Elixir.IEx.CLI

## Options added after -extra are interpreted as plain arguments and
## can be retrieved using :init.get_plain_arguments().
## Enable colors in the shell
-elixir ansi_enabled true

## Options added after -extra are interpreted as plain arguments and can be
## retrieved using :init.get_plain_arguments(). Options before the "--" are
## interpreted by Elixir and anything afterwards is left around for other IEx
## and user applications.
-extra --no-halt
#--
#--dot-iex /etc/iex.exs

0 comments on commit 8873e08

Please sign in to comment.