diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2010-11-26 14:55:41 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-05-19 14:38:15 +0200 |
| commit | bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea (patch) | |
| tree | 7a767a3e37ede77ee9fd5bae5bef0e168939baf5 /lib/ssh/test/Makefile | |
| parent | 2c0bd506cb99362635ebc0aafae36a95dc0a08b3 (diff) | |
| download | otp-bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea.tar.gz otp-bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea.tar.bz2 otp-bafd9b83ef0e7b2ca40c43981eeb6fe8229804ea.zip | |
Add test suite for ssh
Diffstat (limited to 'lib/ssh/test/Makefile')
| -rw-r--r-- | lib/ssh/test/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/ssh/test/Makefile b/lib/ssh/test/Makefile index 78dcb9384b..fc88916e45 100644 --- a/lib/ssh/test/Makefile +++ b/lib/ssh/test/Makefile @@ -115,7 +115,11 @@ release_spec: opt release_tests_spec: opt $(INSTALL_DIR) $(RELSYSDIR) $(INSTALL_DATA) $(ERL_FILES) $(RELSYSDIR) +<<<<<<< HEAD $(INSTALL_DATA) ssh.spec ssh.cover $(RELSYSDIR) +======= + $(INSTALL_DATA) ssh.spec $(RELSYSDIR) +>>>>>>> Add test suite for ssh $(INSTALL_DATA) $(HRL_FILES_NEEDED_IN_TEST) $(RELSYSDIR) @for dir in $(DATA_DIRS); do \ if test ! -d $$dir ; then \ |