Changeset 8db09e4 in mainline

Timestamp:

2014-06-13T11:13:27Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

15d0046

Parents:

134ac5d

Message:

Update PCUT to newest version

Location:

uspace/lib/pcut

Files:

• README.rst (modified) (1 diff)
• base.mak (deleted)
• contrib/devcpp.mak (deleted)
• contrib/pcut.dev (deleted)
• helenos.mak (modified) (1 diff)
• pcut.mak (deleted)
• tests/helenos.mak (deleted)
• tests/tests.mak (deleted)
• unix.mak (deleted)
• update-from-master.sh (modified) (1 diff)
• windows.mak (deleted)

uspace/lib/pcut/README.rst

@@ -65 +65 @@
 -----------------------
 
-On Unix systems, running ``make`` and ``make install`` shall do the job.
+PCUT uses CMake (http://www.cmake.org/).
+On Unix systems, following commands build the library and execute the
+built-in tests::
+
+        mkdir build
+        cd build
+        cmake .. && make all test
 
 More details can be found on https://github.com/vhotspur/pcut/wiki/Building.

uspace/lib/pcut/helenos.mak

@@ -27 +27 @@
 #
 
-PCUT_TARGET_SOURCES = src/os/helenos.c
-
--include base.mak
-
-SOURCES = $(PCUT_SOURCES)
+SOURCES = \
+        src/os/helenos.c \
+        src/assert.c \
+        src/list.c \
+        src/main.c \
+        src/print.c \
+        src/report/report.c \
+        src/report/tap.c \
+        src/report/xml.c \
+        src/run.c
 EXTRA_CFLAGS = -D__helenos__ -Iinclude
 LIBRARY = libpcut

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

@@ -44 +44 @@
 
 $RUN find -not -name update-from-master.sh -delete
-$RUN wget https://github.com/vhotspur/pcut/archive/master.zip -O pcut-master.zip
-$RUN unzip -u pcut-master.zip
+$RUN wget -q https://github.com/vhotspur/pcut/archive/master.zip -O pcut-master.zip
+$RUN unzip -q -u pcut-master.zip
 $RUN mv -f pcut-master/* .
 $RUN rm -rf pcut-master pcut-master.zip
+$RUN rm -rf contrib doc
+$RUN rm -f CMakeLists.txt *.cmake run_test.sh
 
 cat >Makefile <<'EOF_MAKEFILE'