From 89a8ac740c0667fc0bc44d119637a2a8b6b024ac Mon Sep 17 00:00:00 2001 From: Artem Savkov Date: Thu, 26 Apr 2018 15:08:24 +0200 Subject: [PATCH 1/2] Disable git-lfs While convenient git-lfs has too many restrictions for kpatch's needs. Remove links to the objectfiles and related configs. Signed-off-by: Artem Savkov --- .gitattributes | 3 --- .gitignore | 4 ---- test/unit/x86_64/Makefile | 1 - test/unit/x86_64/bug-table-section.ORIG.o | 3 --- test/unit/x86_64/bug-table-section.PATCHED.o | 3 --- test/unit/x86_64/bug-table-section.test | 4 ---- test/unit/x86_64/convert-global-local.ORIG.o | 3 --- test/unit/x86_64/convert-global-local.PATCHED.o | 3 --- test/unit/x86_64/convert-global-local.test | 9 --------- test/unit/x86_64/data-new.ORIG.o | 3 --- test/unit/x86_64/data-new.PATCHED.o | 3 --- test/unit/x86_64/data-new.test | 4 ---- test/unit/x86_64/data-read-mostly.ORIG.o | 3 --- test/unit/x86_64/data-read-mostly.PATCHED.o | 3 --- test/unit/x86_64/data-read-mostly.test | 4 ---- test/unit/x86_64/fixup-section.ORIG.o | 3 --- test/unit/x86_64/fixup-section.PATCHED.o | 3 --- test/unit/x86_64/fixup-section.test | 4 ---- test/unit/x86_64/function-ptr-new.ORIG.o | 3 --- test/unit/x86_64/function-ptr-new.PATCHED.o | 3 --- test/unit/x86_64/function-ptr-new.test | 4 ---- test/unit/x86_64/gcc-constprop.ORIG.o | 3 --- test/unit/x86_64/gcc-constprop.PATCHED.o | 3 --- test/unit/x86_64/gcc-constprop.test | 4 ---- test/unit/x86_64/gcc-static-local-var-3.ORIG.o | 3 --- test/unit/x86_64/gcc-static-local-var-3.PATCHED.o | 3 --- test/unit/x86_64/gcc-static-local-var-3.test | 4 ---- test/unit/x86_64/gcc-static-local-var-5.ORIG.o | 3 --- test/unit/x86_64/gcc-static-local-var-5.PATCHED.o | 3 --- test/unit/x86_64/gcc-static-local-var-5.test | 4 ---- test/unit/x86_64/meminfo-init.ORIG.o | 3 --- test/unit/x86_64/meminfo-init.PATCHED.FAIL.o | 3 --- test/unit/x86_64/meminfo-init2.ORIG.o | 3 --- test/unit/x86_64/meminfo-init2.PATCHED.FAIL.o | 3 --- test/unit/x86_64/meminfo-string.ORIG.o | 3 --- test/unit/x86_64/meminfo-string.PATCHED.o | 3 --- test/unit/x86_64/meminfo-string.test | 4 ---- test/unit/x86_64/new-function.ORIG.o | 3 --- test/unit/x86_64/new-function.PATCHED.o | 3 --- test/unit/x86_64/new-function.test | 4 ---- test/unit/x86_64/replace-section-references.ORIG.o | 3 --- test/unit/x86_64/replace-section-references.PATCHED.o | 3 --- test/unit/x86_64/replace-section-references.test | 4 ---- test/unit/x86_64/smp-locks-section.ORIG.o | 3 --- test/unit/x86_64/smp-locks-section.PATCHED.o | 3 --- test/unit/x86_64/smp-locks-section.test | 4 ---- test/unit/x86_64/special-static-2.ORIG.o | 3 --- test/unit/x86_64/special-static-2.PATCHED.o | 3 --- test/unit/x86_64/special-static-2.test | 4 ---- test/unit/x86_64/special-static.ORIG.o | 3 --- test/unit/x86_64/special-static.PATCHED.o | 3 --- test/unit/x86_64/special-static.test | 4 ---- test/unit/x86_64/tracepoints-section.ORIG.o | 3 --- test/unit/x86_64/tracepoints-section.PATCHED.o | 3 --- test/unit/x86_64/tracepoints-section.test | 4 ---- test/unit/x86_64/warn-detect.ORIG.o | 3 --- test/unit/x86_64/warn-detect.PATCHED.FAIL.o | 3 --- 57 files changed, 191 deletions(-) delete mode 100644 .gitattributes delete mode 100644 test/unit/x86_64/Makefile delete mode 100644 test/unit/x86_64/bug-table-section.ORIG.o delete mode 100644 test/unit/x86_64/bug-table-section.PATCHED.o delete mode 100755 test/unit/x86_64/bug-table-section.test delete mode 100644 test/unit/x86_64/convert-global-local.ORIG.o delete mode 100644 test/unit/x86_64/convert-global-local.PATCHED.o delete mode 100755 test/unit/x86_64/convert-global-local.test delete mode 100644 test/unit/x86_64/data-new.ORIG.o delete mode 100644 test/unit/x86_64/data-new.PATCHED.o delete mode 100755 test/unit/x86_64/data-new.test delete mode 100644 test/unit/x86_64/data-read-mostly.ORIG.o delete mode 100644 test/unit/x86_64/data-read-mostly.PATCHED.o delete mode 100755 test/unit/x86_64/data-read-mostly.test delete mode 100644 test/unit/x86_64/fixup-section.ORIG.o delete mode 100644 test/unit/x86_64/fixup-section.PATCHED.o delete mode 100755 test/unit/x86_64/fixup-section.test delete mode 100644 test/unit/x86_64/function-ptr-new.ORIG.o delete mode 100644 test/unit/x86_64/function-ptr-new.PATCHED.o delete mode 100755 test/unit/x86_64/function-ptr-new.test delete mode 100644 test/unit/x86_64/gcc-constprop.ORIG.o delete mode 100644 test/unit/x86_64/gcc-constprop.PATCHED.o delete mode 100755 test/unit/x86_64/gcc-constprop.test delete mode 100644 test/unit/x86_64/gcc-static-local-var-3.ORIG.o delete mode 100644 test/unit/x86_64/gcc-static-local-var-3.PATCHED.o delete mode 100755 test/unit/x86_64/gcc-static-local-var-3.test delete mode 100644 test/unit/x86_64/gcc-static-local-var-5.ORIG.o delete mode 100644 test/unit/x86_64/gcc-static-local-var-5.PATCHED.o delete mode 100755 test/unit/x86_64/gcc-static-local-var-5.test delete mode 100644 test/unit/x86_64/meminfo-init.ORIG.o delete mode 100644 test/unit/x86_64/meminfo-init.PATCHED.FAIL.o delete mode 100644 test/unit/x86_64/meminfo-init2.ORIG.o delete mode 100644 test/unit/x86_64/meminfo-init2.PATCHED.FAIL.o delete mode 100644 test/unit/x86_64/meminfo-string.ORIG.o delete mode 100644 test/unit/x86_64/meminfo-string.PATCHED.o delete mode 100755 test/unit/x86_64/meminfo-string.test delete mode 100644 test/unit/x86_64/new-function.ORIG.o delete mode 100644 test/unit/x86_64/new-function.PATCHED.o delete mode 100755 test/unit/x86_64/new-function.test delete mode 100644 test/unit/x86_64/replace-section-references.ORIG.o delete mode 100644 test/unit/x86_64/replace-section-references.PATCHED.o delete mode 100755 test/unit/x86_64/replace-section-references.test delete mode 100644 test/unit/x86_64/smp-locks-section.ORIG.o delete mode 100644 test/unit/x86_64/smp-locks-section.PATCHED.o delete mode 100755 test/unit/x86_64/smp-locks-section.test delete mode 100644 test/unit/x86_64/special-static-2.ORIG.o delete mode 100644 test/unit/x86_64/special-static-2.PATCHED.o delete mode 100755 test/unit/x86_64/special-static-2.test delete mode 100644 test/unit/x86_64/special-static.ORIG.o delete mode 100644 test/unit/x86_64/special-static.PATCHED.o delete mode 100755 test/unit/x86_64/special-static.test delete mode 100644 test/unit/x86_64/tracepoints-section.ORIG.o delete mode 100644 test/unit/x86_64/tracepoints-section.PATCHED.o delete mode 100755 test/unit/x86_64/tracepoints-section.test delete mode 100644 test/unit/x86_64/warn-detect.ORIG.o delete mode 100644 test/unit/x86_64/warn-detect.PATCHED.FAIL.o diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index c6a048e..0000000 --- a/.gitattributes +++ /dev/null @@ -1,3 +0,0 @@ -*.ORIG.o filter=lfs diff=lfs merge=lfs -text -*.PATCHED.o filter=lfs diff=lfs merge=lfs -text -*.PATCHED.FAIL.o filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 529a87b..a518cbf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,10 +7,6 @@ *.swp *.d *.so -*.test.out -!*.ORIG.o -!*.PATCHED.o -!*.PATCHED.FAIL.o .tmp_versions Module.symvers kmod/core/.cache.mk diff --git a/test/unit/x86_64/Makefile b/test/unit/x86_64/Makefile deleted file mode 100644 index b302814..0000000 --- a/test/unit/x86_64/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../Makefile.include diff --git a/test/unit/x86_64/bug-table-section.ORIG.o b/test/unit/x86_64/bug-table-section.ORIG.o deleted file mode 100644 index 443d9c8..0000000 --- a/test/unit/x86_64/bug-table-section.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c90532c33be3e1059d1c4e11e8a0a45b910397628bb7ad23d257d1f5793743fb -size 44992 diff --git a/test/unit/x86_64/bug-table-section.PATCHED.o b/test/unit/x86_64/bug-table-section.PATCHED.o deleted file mode 100644 index 72053e0..0000000 --- a/test/unit/x86_64/bug-table-section.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a5d756499e91c19b712ca0534c3469bb0576941ae649f51d21505643719b8f2 -size 45272 diff --git a/test/unit/x86_64/bug-table-section.test b/test/unit/x86_64/bug-table-section.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/bug-table-section.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/convert-global-local.ORIG.o b/test/unit/x86_64/convert-global-local.ORIG.o deleted file mode 100644 index 7b160dd..0000000 --- a/test/unit/x86_64/convert-global-local.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c49c9fdd4df5bac01c1abe0947c404393a4e9d6654f2c883e0413f9d54b3962 -size 157736 diff --git a/test/unit/x86_64/convert-global-local.PATCHED.o b/test/unit/x86_64/convert-global-local.PATCHED.o deleted file mode 100644 index 8a26e1b..0000000 --- a/test/unit/x86_64/convert-global-local.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:22f6c80ae9217515a773d9298297c7beca7715aef356e57e698bbe46bd383b79 -size 157984 diff --git a/test/unit/x86_64/convert-global-local.test b/test/unit/x86_64/convert-global-local.test deleted file mode 100755 index 935a653..0000000 --- a/test/unit/x86_64/convert-global-local.test +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 - -bind=$(nm $1 |awk '/__kmalloc/ {print $2}') -[[ $bind = 't' ]] || exit 1 - -exit 0 diff --git a/test/unit/x86_64/data-new.ORIG.o b/test/unit/x86_64/data-new.ORIG.o deleted file mode 100644 index bea75d3..0000000 --- a/test/unit/x86_64/data-new.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c82d4048941bbe8fb85dae796eec63ad838925150cd740aec18fa506132b52f5 -size 9528 diff --git a/test/unit/x86_64/data-new.PATCHED.o b/test/unit/x86_64/data-new.PATCHED.o deleted file mode 100644 index 5b09a2c..0000000 --- a/test/unit/x86_64/data-new.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ae5708808a8ef41d1d6dda664871b3a4351291c6cba7de6257db96a467ea5dc -size 9608 diff --git a/test/unit/x86_64/data-new.test b/test/unit/x86_64/data-new.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/data-new.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/data-read-mostly.ORIG.o b/test/unit/x86_64/data-read-mostly.ORIG.o deleted file mode 100644 index ded3c55..0000000 --- a/test/unit/x86_64/data-read-mostly.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:74577f1c6457f5dd2d46997377ef57a22f75644cf6f1239699b4d566c9a391c0 -size 315504 diff --git a/test/unit/x86_64/data-read-mostly.PATCHED.o b/test/unit/x86_64/data-read-mostly.PATCHED.o deleted file mode 100644 index 2bed5ed..0000000 --- a/test/unit/x86_64/data-read-mostly.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e7c643e5e190617a08d8625d8cecc979d48b00de171bdc048bdecdd7cbe14aeb -size 315616 diff --git a/test/unit/x86_64/data-read-mostly.test b/test/unit/x86_64/data-read-mostly.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/data-read-mostly.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/fixup-section.ORIG.o b/test/unit/x86_64/fixup-section.ORIG.o deleted file mode 100644 index 318d339..0000000 --- a/test/unit/x86_64/fixup-section.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3564e932091cad1ebea8e3124ff2e695a6cdeb2e77385cb28b2864f02da0a409 -size 25760 diff --git a/test/unit/x86_64/fixup-section.PATCHED.o b/test/unit/x86_64/fixup-section.PATCHED.o deleted file mode 100644 index 6d4bfd5..0000000 --- a/test/unit/x86_64/fixup-section.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:792c261bef5723fa88f5c2a546fdf8d54737c8ecb979ed09d1ba7f3ce299a389 -size 26048 diff --git a/test/unit/x86_64/fixup-section.test b/test/unit/x86_64/fixup-section.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/fixup-section.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/function-ptr-new.ORIG.o b/test/unit/x86_64/function-ptr-new.ORIG.o deleted file mode 100644 index 64f5514..0000000 --- a/test/unit/x86_64/function-ptr-new.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:550e34f0e1ad732f6fb2adee2b8ef40c23959770f3885a99b03387df1ca8b479 -size 9696 diff --git a/test/unit/x86_64/function-ptr-new.PATCHED.o b/test/unit/x86_64/function-ptr-new.PATCHED.o deleted file mode 100644 index a928450..0000000 --- a/test/unit/x86_64/function-ptr-new.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8f71d13f5f4f31dc025ef9a270d7afbb3eb591d09b56a604e578ae23d05d43ff -size 10344 diff --git a/test/unit/x86_64/function-ptr-new.test b/test/unit/x86_64/function-ptr-new.test deleted file mode 100755 index feb62a1..0000000 --- a/test/unit/x86_64/function-ptr-new.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 2 diff --git a/test/unit/x86_64/gcc-constprop.ORIG.o b/test/unit/x86_64/gcc-constprop.ORIG.o deleted file mode 100644 index 4ed05a1..0000000 --- a/test/unit/x86_64/gcc-constprop.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cf616b62df11ad10b14707061ba24a4711107680612eb13deab2668d55d36a7f -size 71704 diff --git a/test/unit/x86_64/gcc-constprop.PATCHED.o b/test/unit/x86_64/gcc-constprop.PATCHED.o deleted file mode 100644 index 9257e60..0000000 --- a/test/unit/x86_64/gcc-constprop.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d60e3a1f928b7a526f8f1a150bdd29487cd85e9d0b47516fd73b641c57af9fee -size 71704 diff --git a/test/unit/x86_64/gcc-constprop.test b/test/unit/x86_64/gcc-constprop.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/gcc-constprop.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/gcc-static-local-var-3.ORIG.o b/test/unit/x86_64/gcc-static-local-var-3.ORIG.o deleted file mode 100644 index e30fca1..0000000 --- a/test/unit/x86_64/gcc-static-local-var-3.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0529108c62c58a736a1cdc88f9d5b32d5230705b9d5e44baf56ee1bc563516ad -size 28600 diff --git a/test/unit/x86_64/gcc-static-local-var-3.PATCHED.o b/test/unit/x86_64/gcc-static-local-var-3.PATCHED.o deleted file mode 100644 index fb2e36c..0000000 --- a/test/unit/x86_64/gcc-static-local-var-3.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:735b1f6eb57d75ad0fd188a7ed0bcf4ca8afb96d9ed19e4421825f65ac04271e -size 29232 diff --git a/test/unit/x86_64/gcc-static-local-var-3.test b/test/unit/x86_64/gcc-static-local-var-3.test deleted file mode 100755 index feb62a1..0000000 --- a/test/unit/x86_64/gcc-static-local-var-3.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 2 diff --git a/test/unit/x86_64/gcc-static-local-var-5.ORIG.o b/test/unit/x86_64/gcc-static-local-var-5.ORIG.o deleted file mode 100644 index 8504436..0000000 --- a/test/unit/x86_64/gcc-static-local-var-5.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3d2d05a244e8c0006968e71f2fffc71eee0286e4b7dbbe5880a8e51eedb3625 -size 75720 diff --git a/test/unit/x86_64/gcc-static-local-var-5.PATCHED.o b/test/unit/x86_64/gcc-static-local-var-5.PATCHED.o deleted file mode 100644 index 12dd714..0000000 --- a/test/unit/x86_64/gcc-static-local-var-5.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1545d26ae126d67e7b8545db1e9060ed7fcd27e5868e7d7e82a3e23bee76fca0 -size 77224 diff --git a/test/unit/x86_64/gcc-static-local-var-5.test b/test/unit/x86_64/gcc-static-local-var-5.test deleted file mode 100755 index 2b445a2..0000000 --- a/test/unit/x86_64/gcc-static-local-var-5.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 5 diff --git a/test/unit/x86_64/meminfo-init.ORIG.o b/test/unit/x86_64/meminfo-init.ORIG.o deleted file mode 100644 index bea75d3..0000000 --- a/test/unit/x86_64/meminfo-init.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c82d4048941bbe8fb85dae796eec63ad838925150cd740aec18fa506132b52f5 -size 9528 diff --git a/test/unit/x86_64/meminfo-init.PATCHED.FAIL.o b/test/unit/x86_64/meminfo-init.PATCHED.FAIL.o deleted file mode 100644 index af79aaf..0000000 --- a/test/unit/x86_64/meminfo-init.PATCHED.FAIL.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78203d10a0e5140ab608ff932932e3ec6cb807e609a59c50b6d908b45821a694 -size 9608 diff --git a/test/unit/x86_64/meminfo-init2.ORIG.o b/test/unit/x86_64/meminfo-init2.ORIG.o deleted file mode 100644 index bea75d3..0000000 --- a/test/unit/x86_64/meminfo-init2.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c82d4048941bbe8fb85dae796eec63ad838925150cd740aec18fa506132b52f5 -size 9528 diff --git a/test/unit/x86_64/meminfo-init2.PATCHED.FAIL.o b/test/unit/x86_64/meminfo-init2.PATCHED.FAIL.o deleted file mode 100644 index 5c7ed63..0000000 --- a/test/unit/x86_64/meminfo-init2.PATCHED.FAIL.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5feaf8bfa5d9195bc4566e644324c0992ca318b2191b5090b645ce0cae690ca1 -size 9688 diff --git a/test/unit/x86_64/meminfo-string.ORIG.o b/test/unit/x86_64/meminfo-string.ORIG.o deleted file mode 100644 index 64f5514..0000000 --- a/test/unit/x86_64/meminfo-string.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:550e34f0e1ad732f6fb2adee2b8ef40c23959770f3885a99b03387df1ca8b479 -size 9696 diff --git a/test/unit/x86_64/meminfo-string.PATCHED.o b/test/unit/x86_64/meminfo-string.PATCHED.o deleted file mode 100644 index 051a547..0000000 --- a/test/unit/x86_64/meminfo-string.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2db6c477940a25d879a91b92d2913f7f268602187d81be551d7623e3caed0f49 -size 9696 diff --git a/test/unit/x86_64/meminfo-string.test b/test/unit/x86_64/meminfo-string.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/meminfo-string.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/new-function.ORIG.o b/test/unit/x86_64/new-function.ORIG.o deleted file mode 100644 index 9a3f75e..0000000 --- a/test/unit/x86_64/new-function.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7269c12c89ea0f716fdc7859912540708917c49ca877a9c4c68484ba99aa8878 -size 35912 diff --git a/test/unit/x86_64/new-function.PATCHED.o b/test/unit/x86_64/new-function.PATCHED.o deleted file mode 100644 index e5273cb..0000000 --- a/test/unit/x86_64/new-function.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e25c16a5039a5300f3816f40b93f7e0dc8976dfc0a637f77937ec60f83fb82fb -size 36176 diff --git a/test/unit/x86_64/new-function.test b/test/unit/x86_64/new-function.test deleted file mode 100755 index feb62a1..0000000 --- a/test/unit/x86_64/new-function.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 2 diff --git a/test/unit/x86_64/replace-section-references.ORIG.o b/test/unit/x86_64/replace-section-references.ORIG.o deleted file mode 100644 index ca6225e..0000000 --- a/test/unit/x86_64/replace-section-references.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:383827483e470394fb5d41fce5d9a71de2b281974b034a3415062902df198dec -size 547392 diff --git a/test/unit/x86_64/replace-section-references.PATCHED.o b/test/unit/x86_64/replace-section-references.PATCHED.o deleted file mode 100644 index f5882ce..0000000 --- a/test/unit/x86_64/replace-section-references.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f54a179c6a4abb64557016221a283c71fcdda2c524b9688dfc2730b35d22e251 -size 547680 diff --git a/test/unit/x86_64/replace-section-references.test b/test/unit/x86_64/replace-section-references.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/replace-section-references.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/smp-locks-section.ORIG.o b/test/unit/x86_64/smp-locks-section.ORIG.o deleted file mode 100644 index 3168ee6..0000000 --- a/test/unit/x86_64/smp-locks-section.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8718b5b17db29fbf52f82eb40cfcd36c4f79e119e368f61321ab6578399c3cf1 -size 16784 diff --git a/test/unit/x86_64/smp-locks-section.PATCHED.o b/test/unit/x86_64/smp-locks-section.PATCHED.o deleted file mode 100644 index f227e33..0000000 --- a/test/unit/x86_64/smp-locks-section.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb7a7b77873bb58768fd9c23fc56f1d1890530fac83290349db6bbaa8eb05c1e -size 17088 diff --git a/test/unit/x86_64/smp-locks-section.test b/test/unit/x86_64/smp-locks-section.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/smp-locks-section.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/special-static-2.ORIG.o b/test/unit/x86_64/special-static-2.ORIG.o deleted file mode 100644 index 29be26a..0000000 --- a/test/unit/x86_64/special-static-2.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2331c16208f12843c84eb277fb63c7564e1b930f45632e4e423064413606a861 -size 525184 diff --git a/test/unit/x86_64/special-static-2.PATCHED.o b/test/unit/x86_64/special-static-2.PATCHED.o deleted file mode 100644 index 34ad0b7..0000000 --- a/test/unit/x86_64/special-static-2.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6db5ec7322ebc78086c8334235453c9fc99119447f02fcbdc2883936a88bc5a5 -size 525888 diff --git a/test/unit/x86_64/special-static-2.test b/test/unit/x86_64/special-static-2.test deleted file mode 100755 index feb62a1..0000000 --- a/test/unit/x86_64/special-static-2.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 2 diff --git a/test/unit/x86_64/special-static.ORIG.o b/test/unit/x86_64/special-static.ORIG.o deleted file mode 100644 index 8c66c01..0000000 --- a/test/unit/x86_64/special-static.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b901d86e5d599e6a88c12431df55a465d7afa2939af779b8dc720bbafa56522a -size 89288 diff --git a/test/unit/x86_64/special-static.PATCHED.o b/test/unit/x86_64/special-static.PATCHED.o deleted file mode 100644 index 26e2cb7..0000000 --- a/test/unit/x86_64/special-static.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2cd61e78c41a68816a93a0de97a2d30043c5279f0e5c80ad2692321ff0d6f4b -size 89760 diff --git a/test/unit/x86_64/special-static.test b/test/unit/x86_64/special-static.test deleted file mode 100755 index feb62a1..0000000 --- a/test/unit/x86_64/special-static.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 2 diff --git a/test/unit/x86_64/tracepoints-section.ORIG.o b/test/unit/x86_64/tracepoints-section.ORIG.o deleted file mode 100644 index ae320ef..0000000 --- a/test/unit/x86_64/tracepoints-section.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f00c311e4b79b03805ccd367e3ea889cef25c3f5db887b9c871ce1f200aa59e -size 95048 diff --git a/test/unit/x86_64/tracepoints-section.PATCHED.o b/test/unit/x86_64/tracepoints-section.PATCHED.o deleted file mode 100644 index 6720373..0000000 --- a/test/unit/x86_64/tracepoints-section.PATCHED.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:198143f177fa687b07cc3f35f6af262a3901514416a4f69d4bbc701164f427d3 -size 95280 diff --git a/test/unit/x86_64/tracepoints-section.test b/test/unit/x86_64/tracepoints-section.test deleted file mode 100755 index 3071c8e..0000000 --- a/test/unit/x86_64/tracepoints-section.test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -source $KPATCH_TEST_LIBRARY - -assert_num_funcs 1 diff --git a/test/unit/x86_64/warn-detect.ORIG.o b/test/unit/x86_64/warn-detect.ORIG.o deleted file mode 100644 index e18526b..0000000 --- a/test/unit/x86_64/warn-detect.ORIG.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e3dd874c11ffe5f92fbaf3cd4975e93b991896963a329b12d45828a45a63f50 -size 267648 diff --git a/test/unit/x86_64/warn-detect.PATCHED.FAIL.o b/test/unit/x86_64/warn-detect.PATCHED.FAIL.o deleted file mode 100644 index fad881d..0000000 --- a/test/unit/x86_64/warn-detect.PATCHED.FAIL.o +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:152b15d618ed8c2ae3476bf179147a02501920b948e81ad15d6e8e124d456933 -size 267648 From ffc4122efb0dbc55cdf2e50f3499d73ff675ea08 Mon Sep 17 00:00:00 2001 From: Artem Savkov Date: Thu, 26 Apr 2018 15:24:40 +0200 Subject: [PATCH 2/2] Add kpatch-unit-objs submodule Add a submodule containing object files for unittests. Signed-off-by: Artem Savkov --- .gitmodules | 3 +++ test/unit/Makefile | 14 +++++++++----- test/unit/Makefile.include | 9 +-------- test/unit/objs | 1 + 4 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 .gitmodules create mode 160000 test/unit/objs diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..49b1024 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "test/unit/objs"] + path = test/unit/objs + url = https://github.com/dynup/kpatch-unit-test-objs.git diff --git a/test/unit/Makefile b/test/unit/Makefile index 15a72bd..c4e5c5d 100644 --- a/test/unit/Makefile +++ b/test/unit/Makefile @@ -1,7 +1,11 @@ -ARCH=$(shell uname -m) +ARCH = $(shell uname -m) +OBJDIR ?= objs/$(ARCH) -all: Makefile.include $(ARCH)/Makefile - $(MAKE) -C $(ARCH) +.PHONY: all clean -clean: Makefile.include $(ARCH)/Makefile - $(MAKE) -C $(ARCH) clean +all: Makefile.include + git submodule update --init --rebase + $(MAKE) -C $(OBJDIR) + +clean: Makefile.include + $(MAKE) -C $(OBJDIR) clean diff --git a/test/unit/Makefile.include b/test/unit/Makefile.include index 45a503f..2f07fe9 100644 --- a/test/unit/Makefile.include +++ b/test/unit/Makefile.include @@ -12,7 +12,7 @@ MUTE_FAIL := >/dev/null 2>&1 .SILENT: $(TARGETS) $(TEST_TARGETS) endif -SRC_PATH ?= $(realpath ../../../) +SRC_PATH ?= $(realpath ../../../../) CDO ?= $(SRC_PATH)/kpatch-build/create-diff-object TEST_LIBRARY ?= $(SRC_PATH)/test/test-functions.sh @@ -22,12 +22,6 @@ TEST_ENV = KPATCH_TEST_LIBRARY=$(TEST_LIBRARY) TARGETS = $(patsubst %.$(EXT_ORIG),%.$(EXT_OUTPUT),$(wildcard *.$(EXT_ORIG))) TEST_TARGETS = $(patsubst %.$(EXT_TEST),%.$(EXT_TEST_OUTPUT),$(wildcard *.$(EXT_TEST))) -define check_lfs = - $(if $(shell head -1 $(1) | grep git-lfs.github.com), - $(error $(1) is not fetched. Unittests require https://git-lfs.github.com/), - ) -endef - define check_stripped = $(if $(shell readelf --debug-dump $(1)), $(error $(1) is not properly stripped, use 'strip --strip-debug --keep-file-symbols $(1)' to fix this), @@ -35,7 +29,6 @@ define check_stripped = endef define check_all = - $(call check_lfs,$(1)) $(call check_stripped,$(1)) endef diff --git a/test/unit/objs b/test/unit/objs new file mode 160000 index 0000000..5e9ba83 --- /dev/null +++ b/test/unit/objs @@ -0,0 +1 @@ +Subproject commit 5e9ba838509a38817bf394fdbb43b4f1ce5a9229