On Thu, Jan 14, 2010 at 12:29 AM, Garrett Cooper <[email protected]> wrote:
> On Wed, Jan 13, 2010 at 11:30 PM, Mitani <[email protected]> wrote:
>> Hi,
>>
>> I tried to test "unzip01".
>> But I get still the same fail at 2010-01-14 cvs.
>>
>> I think that this failure occurs because "DIR" can't be defined
>> correctly in "${LTPROOT}/testcases/commands/unzip/Makefile" and
>> all files of "/opt/ltp/testcases/bin" directory was compressed.
>>
>> There is the definition "DIR := tst_unzip.dir" in "${LTPROOT}/testcases
>> /commands/unzip/Makefile". But there is the definition "DIR := /opt/ltp
>> /testcases/bin" in two include files ("${LTPROOT}/include/mk/env_pre.mk"
>> and "${LTPROOT}/include/mk/generic_leaf_target.mk") which are included
>> in "${LTPROOT}/testcases/commands/unzip/Makefile".
>>
>> Perhaps, "DIR := tst_unzip.dir" is replaced by "DIR := /opt/ltp
>> /testcases/bin" when the two files were included, I think.
>>
>> This test requires "tst_unzip.dir" and if the variable name "DIR" is
>> changed to another name, this problem will not occur.
>>
>>
>>> .INTERMEDIATE may be the only piece of value here, but I was avoiding
>>> it because it's a 3.81-ism I thought...
>>
>> So, I don't try use .INTERMEDIATE target.
>>
>> However, the compress target directory ("tst_unzip.dir") is created
>> under "$LTPROOT/testcases/commands/unzip" directory.
>> But I think that it does not affect for the test because the compressed
>> file which is for the test ("tst_unzip_file.zip") is create under
>> the run directory ("/opy/ltp"). "tst_unzip.dir" is the file which isn't
>> related directly to the practice of the test, I think.
>>
>> How about this patch:
>> ============
>> --- Makefile.org 2009-12-11 21:50:29.000000000 +0900
>> +++ Makefile 2010-01-14 11:44:30.000000000 +0900
>> @@ -27,7 +27,7 @@
>> # Only build and install if we have the zip command.
>> HAVE_ZIPTOOLS := $(shell if which zip >/dev/null; then echo yes;
>> else echo no; fi)
>>
>> -DIR := tst_unzip.dir
>> +COMPRESS_DIR := tst_unzip.dir
>>
>> RM += -r
>>
>> @@ -36,7 +36,7 @@
>> ZIPFILE := $(TESTCASES_DATA_DIR)/tst_unzip_file.zip
>>
>> ifeq ($(HAVE_ZIPTOOLS),yes)
>> -CLEAN_TARGETS := $(DIR) $(ZIPFILE)
>> +CLEAN_TARGETS := $(COMPRESS_DIR) $(ZIPFILE)
>> INSTALL_TARGETS := unzip_tests.sh
>> endif
>>
>> @@ -45,13 +45,13 @@
>> $(TESTCASES_DATA_DIR):
>> mkdir -p "$@"
>>
>> -$(ZIPFILE): | $(TESTCASES_DATA_DIR) $(DIR)
>> - zip -r "$@" $(DIR)
>> +$(ZIPFILE): | $(TESTCASES_DATA_DIR) $(COMPRESS_DIR)
>> + zip -r "$@" $(COMPRESS_DIR)
>> chmod 00666 "$@"
>>
>> # This target should be auto-removed by Make
>> -$(DIR): $(abs_srcdir)/unzip_genfile.sh
>> - $(SHELL) "$^" $(DIR)
>> +$(COMPRESS_DIR): $(abs_srcdir)/unzip_genfile.sh
>> + $(SHELL) "$^" $(COMPRESS_DIR)
>>
>> include $(top_srcdir)/include/mk/generic_leaf_target.mk
>>
>> ============
>>
>>
>> I'm glad if I can get opinion that my revision is right or not.
>>
>>
>> Regards--
>>
>>
>> -Tomonori Mitani
>
> Crap, you spotted the problem, but it was just in the wrong spot (from
> functions.mk):
>
> #
> # Generate the directory install dependency separate from
> generate_install_rule
> # to avoid noise from Make about redefining existing targets, for good reason.
> #
> # 1 -> The base install directory, based off $(prefix), or another
> # $(prefix)-like variable. Automatically gets $(DESTDIR) tacked on it.
> # 2 -> The install target. This can be relative to $(srcdir), but will most
> # likely be `empty'.
> #
> define generate_install_rule_dir_dep
> ifdef MAKE_3_80_COMPAT
> DIR := $$(call MAKE_3_80_abspath,$(DESTDIR)/$(1)/$(2))
> else
> DIR := $$(abspath $(DESTDIR)/$(1)/$(2))
> endif
> $$(DIR):
> mkdir -p "$$@"
> endef
>
>>_>... I'm trying out something to get rid of this item... I'll get back to
>>you in a few.
>
>> -----Original Message-----
>> From: Garrett Cooper [mailto:[email protected]]
>> Sent: Tuesday, December 22, 2009 11:39 AM
>> To: Caspar Zhang
>> Cc: [email protected]; Mitani
>> Subject: Re: [LTP] "unzip01" testcase failed.
>>
>> On Mon, Dec 21, 2009 at 1:10 AM, Garrett Cooper <[email protected]> wrote:
>>> On Sun, Dec 20, 2009 at 9:45 PM, Caspar Zhang <[email protected]> wrote:
>>>>
>>>> ----- "Garrett Cooper" <[email protected]> wrote:
>>>>>
>>>>> I'm not convinced that this is the right solution because most of
>>>>> what's done here just replaced $(DIR)'s value with the bareword
>>>>> value.
>>>>> .INTERMEDIATE may be the only piece of value here, but I was avoiding
>>>>> it because it's a 3.81-ism I thought...
>>>>
>>>> How about this one (see the attachment)?
>>>
>>> AH... -[Rr] was missing.
>>>
>>> RM += -[Rr]
>>>
>>> will do that. The rest just seems spurious.
>>
>> Uh, this was already committed on HEAD:
Please try now. I removed the other offending code in include/mk.
Thanks,
-Garrett
------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
