Ignore:
Timestamp:
2016-05-22T19:19:43Z (9 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
b272c67a
Parents:
153c7a29 (diff), af2254ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/pcut/update-from-master.sh

    r153c7a29 r0dc2fec  
    5959PCUT_TEST_PREFIX = test-libpcut-
    6060
    61 EXTRA_OUTPUT = \
     61SELF_TESTS = \
    6262EOF_MAKEFILE_HEAD
    6363
    … …  
    6969cat >>Makefile <<'EOF_MAKEFILE_TAIL'
    7070
     71EXTRA_CLEAN = $(SELF_TESTS)
     72
    7173include helenos.mak
    7274
    … …  
    7577include helenos.test.mak
    7678
     79all-test: $(SELF_TESTS)
     80
    7781test-libpcut-%: $(OUTPUT)
    7882        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -o $@ $^ $(OUTPUT) $(BASE_LIBS)
Note: See TracChangeset for help on using the changeset viewer.