diff options
| author | Raimo Niskanen <[email protected]> | 2010-07-07 12:09:52 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2010-07-07 12:09:52 +0200 |
| commit | c752a4ea65c744ac283cc277717f8defa15ae610 (patch) | |
| tree | c01e45e9840a19a9f326cf346d0e81d53b995a5e /lib/common_test/priv | |
| parent | 725dc6a14dcf5db071e9872b0661c792368d8edb (diff) | |
| parent | 311ed3490b2b9dc93433827a3941c14e40f41a2e (diff) | |
| download | otp-c752a4ea65c744ac283cc277717f8defa15ae610.tar.gz otp-c752a4ea65c744ac283cc277717f8defa15ae610.tar.bz2 otp-c752a4ea65c744ac283cc277717f8defa15ae610.zip | |
Merge branch 'peppe/common_test/dev/OTP-8725' of super:peppe_otp into dev
* 'peppe/common_test/dev/OTP-8725' of super:peppe_otp:
Fix bug that crashes common_test when running cover
Bump version numbers for common_test and test_server
Add documentation for group specifications and for the label option
Improve handling of test case group specifications
Add textured backgound to html log files
Improve handling of test case group specifications
Add new option to label test runs
Implement handling of group specifications
Fix problem with using the wrong logdir setting
Rewrite handling of group definitions in Common Test test suites
Diffstat (limited to 'lib/common_test/priv')
| -rw-r--r-- | lib/common_test/priv/Makefile.in | 20 | ||||
| -rw-r--r-- | lib/common_test/priv/tile1.jpg | bin | 0 -> 34734 bytes |
2 files changed, 10 insertions, 10 deletions
diff --git a/lib/common_test/priv/Makefile.in b/lib/common_test/priv/Makefile.in index f144847a29..6372bbc8d5 100644 --- a/lib/common_test/priv/Makefile.in +++ b/lib/common_test/priv/Makefile.in @@ -56,8 +56,9 @@ ifneq ($(findstring win32,$(TARGET)),win32) # # Files # -FILES = vts.tool run_test.in -SCRIPTS = install.sh +FILES = +SCRIPTS = +IMAGES = tile1.jpg # # Rules @@ -83,14 +84,12 @@ include $(ERL_TOP)/make/otp_release_targets.mk ifeq ($(XNIX),true) release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin - $(INSTALL_SCRIPT) $(SCRIPTS) $(RELSYSDIR) - $(INSTALL_DATA) $(FILES) $(RELSYSDIR)/priv + $(INSTALL_DIR) $(RELSYSDIR)/priv + $(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv else release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin - $(INSTALL_SCRIPT) $(SCRIPTS) $(RELSYSDIR) - $(INSTALL_DATA) $(FILES) $(RELSYSDIR)/priv + $(INSTALL_DIR) $(RELSYSDIR)/priv + $(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv endif release_docs_spec: @@ -105,6 +104,7 @@ else # Files # FILES = vts.tool +IMAGES = tile1.jpg # # Rules @@ -123,8 +123,8 @@ clean: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt - $(INSTALL_DIR) $(RELSYSDIR)/priv/bin - $(INSTALL_DATA) $(FILES) $(RELSYSDIR)/priv + $(INSTALL_DIR) $(RELSYSDIR)/priv + $(INSTALL_DATA) $(FILES) $(IMAGES) $(RELSYSDIR)/priv release_docs_spec: diff --git a/lib/common_test/priv/tile1.jpg b/lib/common_test/priv/tile1.jpg Binary files differnew file mode 100644 index 0000000000..8749383716 --- /dev/null +++ b/lib/common_test/priv/tile1.jpg |
