diff options
| author | Erlang/OTP <[email protected]> | 2010-08-27 11:45:30 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-08-27 11:45:30 +0200 |
| commit | 4a54b4ac3d9324e760c2839d5a224a461fd3f970 (patch) | |
| tree | 7427fcfde941f50b7f1cf14454dbcd1a1001230d /lib/asn1/test/Makefile | |
| parent | 087b863947f6689ea9d47300b24528015e579dc0 (diff) | |
| parent | 57f41f6da3945547436e32ef22765add14902d03 (diff) | |
| download | otp-4a54b4ac3d9324e760c2839d5a224a461fd3f970.tar.gz otp-4a54b4ac3d9324e760c2839d5a224a461fd3f970.tar.bz2 otp-4a54b4ac3d9324e760c2839d5a224a461fd3f970.zip | |
Merge branch 'bjorn/asn1/eliminate-duplicate-data-dir' of ../bjorn_otp into HEAD
* 'bjorn/asn1/eliminate-duplicate-data-dir' of ../bjorn_otp:
asn1 tests: Remove duplicated SUITE data directories
Diffstat (limited to 'lib/asn1/test/Makefile')
| -rw-r--r-- | lib/asn1/test/Makefile | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/lib/asn1/test/Makefile b/lib/asn1/test/Makefile index d91b77dfc5..b065db7de8 100644 --- a/lib/asn1/test/Makefile +++ b/lib/asn1/test/Makefile @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 1997-2009. All Rights Reserved. +# Copyright Ericsson AB 1997-2010. All Rights Reserved. # # The contents of this file are subject to the Erlang Public License, # Version 1.1, (the "License"); you may not use this file except in @@ -190,23 +190,16 @@ release_spec: opt release_tests_spec: opt $(INSTALL_DIR) $(RELSYSDIR) + $(INSTALL_DIR) $(RELSYSDIR)/asn1_SUITE_data + $(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_SUITE_data + $(INSTALL_DIR) $(RELSYSDIR)/asn1_bin_v2_SUITE_data $(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR) $(INSTALL_DATA) asn1.spec $(INSTALL_PROGS) $(RELSYSDIR) chmod -f -R u+w $(RELSYSDIR) - @tar cfh - *_SUITE_data | (cd $(RELSYSDIR); tar xf -) + cd asn1_SUITE_data; tar cfh $(RELSYSDIR)/asn1_SUITE_data.tar * + cd $(RELSYSDIR)/asn1_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar + cd $(RELSYSDIR)/asn1_bin_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar + cd $(RELSYSDIR)/asn1_bin_v2_SUITE_data; tar xf $(RELSYSDIR)/asn1_SUITE_data.tar + rm $(RELSYSDIR)/asn1_SUITE_data.tar release_docs_spec: - - - - - - - - - - - - - - |