Changeset 97c7682 in mainline for kernel/test/print/print1.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• kernel/test/print/print1.c (modified) (2 diffs)

kernel/test/print/print1.c

@@ -41 +41 @@
         
         TPRINTF("Testing printf(\"%%8.10s\", \"text\"):\n");
-        TPRINTF("Expected output: \"text\"\n");
+        TPRINTF("Expected output: \"    text\"\n");
         TPRINTF("Real output:     \"%8.10s\"\n\n", "text");
         
@@ -48 +48 @@
         TPRINTF("Real output:     \"%8.10s\"\n\n", "very long text");
         
+        TPRINTF("Testing printf(\"%%-*.*s\", 7, 7, \"text\"):\n");
+        TPRINTF("Expected output: \"text   \"\n");
+        TPRINTF("Real output:     \"%-*.*s\"\n\n", 7, 7, "text");
+        
         return NULL;
 }