summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hawthorn <john.hawthorn@gmail.com>2016-12-30 18:13:06 -0800
committerJohn Hawthorn <john.hawthorn@gmail.com>2016-12-30 18:13:18 -0800
commit30aa7ea94288ceaf4f2ef8a73bcfdcc5dae452b6 (patch)
tree97d78acc35adcdd969a3f952e32644838454cc47
parentc373470cbb72af3f1432f01c255c7ce69eb04aee (diff)
Rename acceptance test
-rw-r--r--.gitignore2
-rw-r--r--Makefile6
-rw-r--r--test/acceptance/Gemfile (renamed from test/integration/Gemfile)0
-rw-r--r--test/acceptance/Gemfile.lock (renamed from test/integration/Gemfile.lock)0
-rw-r--r--test/acceptance/acceptance_test.rb (renamed from test/integration/integration_test.rb)0
5 files changed, 4 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 9f5dca5..70aba0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,4 @@ fzy
fzytest
*.o
config.h
-test/integration/vendor/bundle
+test/acceptance/vendor/bundle
diff --git a/Makefile b/Makefile
index ebb6ad2..530bd2f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,8 @@ all: fzy
test/fzytest: $(TESTOBJECTS)
$(CC) $(CFLAGS) $(CCFLAGS) -Isrc -o $@ $(TESTOBJECTS) $(LIBS)
-integration_test: fzy
- cd test/integration && bundle && bundle exec ruby integration_test.rb
+acceptance: fzy
+ cd test/acceptance && bundle && bundle exec ruby acceptance_test.rb
test: check
check: test/fzytest
@@ -53,4 +53,4 @@ clean:
veryclean: clean
rm -f config.h
-.PHONY: test check all clean veryclean install fmt integration_test
+.PHONY: test check all clean veryclean install fmt acceptance
diff --git a/test/integration/Gemfile b/test/acceptance/Gemfile
index a4a59f6..a4a59f6 100644
--- a/test/integration/Gemfile
+++ b/test/acceptance/Gemfile
diff --git a/test/integration/Gemfile.lock b/test/acceptance/Gemfile.lock
index 8706089..8706089 100644
--- a/test/integration/Gemfile.lock
+++ b/test/acceptance/Gemfile.lock
diff --git a/test/integration/integration_test.rb b/test/acceptance/acceptance_test.rb
index aed795d..aed795d 100644
--- a/test/integration/integration_test.rb
+++ b/test/acceptance/acceptance_test.rb