summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2015-06-28 19:42:20 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2015-06-28 19:45:24 (GMT)
commit57e14d4c178ca90588b1a1a12f235995cc868276 (patch)
treec6a4f9c5bce6a2cfff2482825cb8a2fd3b54c063
parent14064beafbb7f3a2356ceba672633f4564429d57 (diff)
downloadlz4-57e14d4c178ca90588b1a1a12f235995cc868276.zip
lz4-57e14d4c178ca90588b1a1a12f235995cc868276.tar.gz
lz4-57e14d4c178ca90588b1a1a12f235995cc868276.tar.bz2
renamed directory to versionsTest
-rw-r--r--.travis.yml2
-rw-r--r--Makefile8
-rw-r--r--versionsTest/Makefile (renamed from test/Makefile)4
-rw-r--r--versionsTest/test-lz4-versions.py (renamed from test/test-lz4-versions.py)6
4 files changed, 10 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index e42ed82..87cb9a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ env:
- LZ4_TRAVIS_CI_ENV=staticAnalyze
- LZ4_TRAVIS_CI_ENV=gpptest
- LZ4_TRAVIS_CI_ENV=armtest
- - LZ4_TRAVIS_CI_ENV=versionstest
+ - LZ4_TRAVIS_CI_ENV=versionsTest
- LZ4_TRAVIS_CI_ENV=test-lz4
- LZ4_TRAVIS_CI_ENV=test-lz4c
- LZ4_TRAVIS_CI_ENV=test-lz4c32
diff --git a/Makefile b/Makefile
index 8fa72f0..d2c4a0f 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ VOID = /dev/null
endif
-.PHONY: default all lib lz4programs clean test
+.PHONY: default all lib lz4programs clean test versionsTest
default: lz4programs
@@ -75,7 +75,7 @@ clean:
@cd $(PRGDIR); $(MAKE) clean > $(VOID)
@cd $(LZ4DIR); $(MAKE) clean > $(VOID)
@cd examples; $(MAKE) clean > $(VOID)
- @cd test; $(MAKE) clean > $(VOID)
+ @cd versionsTest; $(MAKE) clean > $(VOID)
@echo Cleaning completed
@@ -118,8 +118,8 @@ armtest: clean
cd lib; $(MAKE) -e all CC=arm-linux-gnueabi-gcc CPPFLAGS="-Werror"
cd programs; $(MAKE) -e bins CC=arm-linux-gnueabi-gcc CPPFLAGS="-Werror"
-versionstest: clean
- @cd test; $(MAKE)
+versionsTest: clean
+ @cd versionsTest; $(MAKE)
examples:
cd lib; $(MAKE) -e
diff --git a/test/Makefile b/versionsTest/Makefile
index d1768d4..2ce719a 100644
--- a/test/Makefile
+++ b/versionsTest/Makefile
@@ -30,9 +30,9 @@ TESTDIR := lz4test
default: all
-all: versionstest
+all: versionsTest
-versionstest:
+versionsTest:
$(PYTHON) test-lz4-versions.py
clean:
diff --git a/test/test-lz4-versions.py b/versionsTest/test-lz4-versions.py
index 5531a05..caf1922 100644
--- a/test/test-lz4-versions.py
+++ b/versionsTest/test-lz4-versions.py
@@ -9,7 +9,7 @@ import sys
import hashlib
repo_url = 'https://github.com/Cyan4973/lz4.git'
-tmp_dir_name = 'test/lz4test'
+tmp_dir_name = 'versionsTest/lz4test'
make_cmd = 'make'
git_cmd = 'git'
test_dat_src = 'README.md'
@@ -46,8 +46,8 @@ def sha1_of_file(filepath):
if __name__ == '__main__':
error_code = 0
base_dir = os.getcwd() + '/..' # /path/to/lz4
- tmp_dir = base_dir + '/' + tmp_dir_name # /path/to/lz4/test/lz4test
- clone_dir = tmp_dir + '/' + 'lz4' # /path/to/lz4/test/lz4test/lz4
+ tmp_dir = base_dir + '/' + tmp_dir_name # /path/to/lz4/versionsTest/lz4test
+ clone_dir = tmp_dir + '/' + 'lz4' # /path/to/lz4/versionsTest/lz4test/lz4
programs_dir = base_dir + '/programs' # /path/to/lz4/programs
os.makedirs(tmp_dir, exist_ok=True)