diff options
-rw-r--r-- | .github/workflows/ccpp.yml | 32 | ||||
-rwxr-xr-x | t/inotifywait-daemon-logs-to-relative-paths.t | 5 | ||||
-rwxr-xr-x | t/inotifywait-no-event-occured.t | 3 |
3 files changed, 25 insertions, 15 deletions
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index fc50b0b..bcbbabb 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,13 +10,17 @@ jobs: steps: - uses: actions/checkout@v1 - name: gcc build - run: git clean -fdx && export CC=gcc && ./autogen.sh && ./configure && make - - name: test - run: cd ./libinotifytools/src/ && make test && ./test + run: git clean -fdx && export CC=gcc && ./autogen.sh && ./configure && make -j2 + - name: unit test + run: cd ./libinotifytools/src/ && make -j2 test && ./test + - name: integration test + run: cd t && make -j2 - name: clang build - run: git clean -fdx && export CC=clang && ./autogen.sh && ./configure && make - - name: test - run: cd ./libinotifytools/src/ && make test && ./test + run: git clean -fdx && export CC=clang && ./autogen.sh && ./configure && make -j2 + - name: unit test + run: cd ./libinotifytools/src/ && make -j2 test && ./test + - name: integration test + run: cd t && make -j2 build-1804: @@ -25,11 +29,15 @@ jobs: steps: - uses: actions/checkout@v1 - name: gcc build - run: git clean -fdx && export CC=gcc && ./autogen.sh && ./configure && make - - name: test - run: cd ./libinotifytools/src/ && make test && ./test + run: git clean -fdx && export CC=gcc && ./autogen.sh && ./configure && make -j2 + - name: unit test + run: cd ./libinotifytools/src/ && make -j2 test && ./test + - name: integration test + run: cd t && make -j2 - name: clang build - run: git clean -fdx && export CC=clang && ./autogen.sh && ./configure && make - - name: test - run: cd ./libinotifytools/src/ && make test && ./test + run: git clean -fdx && export CC=clang && ./autogen.sh && ./configure && make -j2 + - name: unit test + run: cd ./libinotifytools/src/ && make -j2 test && ./test + - name: integration test + run: cd t && make -j2 diff --git a/t/inotifywait-daemon-logs-to-relative-paths.t b/t/inotifywait-daemon-logs-to-relative-paths.t index f7eb6e0..a3bafa4 100755 --- a/t/inotifywait-daemon-logs-to-relative-paths.t +++ b/t/inotifywait-daemon-logs-to-relative-paths.t @@ -15,9 +15,10 @@ run_() { # inotifywait has been set up. timeout=2 && touch $logfile test-file && - {(sleep 1 && touch -a test-file)&} && + {(sleep 1 && chmod 777 test-file)&} && - inotifywait \ + export LD_LIBRARY_PATH="../../libinotifytools/src/.libs/" + ../../src/.libs/inotifywait \ --quiet \ --daemon \ --outfile $logfile \ diff --git a/t/inotifywait-no-event-occured.t b/t/inotifywait-no-event-occured.t index 792f9b0..c0f0330 100755 --- a/t/inotifywait-no-event-occured.t +++ b/t/inotifywait-no-event-occured.t @@ -5,8 +5,9 @@ test_description='No event occured for inotifywait' . ./sharness.sh run_() { + export LD_LIBRARY_PATH="../../libinotifytools/src/.libs/" touch test && - inotifywait --quiet --timeout 1 test + ../../src/.libs/inotifywait --quiet --timeout 1 test } test_expect_success 'Exit code 2 is returned' ' |