clean up "helper" files

.dockerignore

@@ -1,2 +1,9 @@
 /.git
 /.vscode
+/**/*.o
+/**/*.so
+
+/results/
+
+/regression.diffs
+/regression.out

.gitignore

@@ -1,7 +1,7 @@
-*.swp
+/**/*.o
-*.o
+/**/*.so
-*.so
+
-regression.diffs
-regression.out
 /results/
 
+/regression.diffs
+/regression.out

.vscode/c_cpp_properties.json

@@ -28,6 +28,7 @@
             "includePath": [
                 "/usr/include",
                 "/usr/local/include",
+                "/usr/include/postgresql/server",
                 "${workspaceRoot}"
             ],
             "defines": [],
@@ -75,15 +76,7 @@
             "intelliSenseMode": "clang-x64",
             "includePath": [
                 "${workspaceRoot}",
-                "${workspaceRoot}/src",
+                "${workspaceRoot}/src"
-                "${localappdata}/lxss/rootfs/usr/include/c++/5",
-                "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu/c++/5",
-                "${localappdata}/lxss/rootfs/usr/include/c++/5/backward",
-                "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include",
-                "${localappdata}/lxss/rootfs/usr/local/include",
-                "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/5/include-fixed",
-                "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu",
-                "${localappdata}/lxss/rootfs/usr/include"
             ],
             "defines": [
                 "__linux__",
@@ -106,5 +99,5 @@
             }
         }
     ],
-    "version": 3
+    "version": 4
 }

Makefile

@@ -30,9 +30,3 @@ SHLIB_LINK := -lphonenumber -lstdc++
 PG_CONFIG := pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
-
-# Docker stuff
-.PHONY: docker-image
-
-docker-image: clean
-	docker build -t pg_libphonenumber .

README.md

@@ -49,8 +49,4 @@ sudo make install
 ## Running tests
 
 For convenience, we provide a Docker image that sets up a test environment.
-
+Run the script `./run-tests.sh` to build and run the image.
-```shell-script
-make docker-image
-docker run -it pg_libphonenumber
-```

docker/run-tests.sh

@@ -3,8 +3,7 @@
 # Used in the Docker image to run tests
 
 PGDATA=/var/lib/postgresql/data
-# Reads PG_MAJOR from the environment
 pg_ctl=/usr/lib/postgresql/${PG_MAJOR}/bin/pg_ctl
-$pg_ctl "--pgdata=${PGDATA}" start -w
+"$pg_ctl" "--pgdata=${PGDATA}" start -w
 make installcheck
-$pg_ctl "--pgdata=${PGDATA}" stop
+"$pg_ctl" "--pgdata=${PGDATA}" stop

run-tests.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+docker build -t pg_libphonenumber_test -f docker/Dockerfile .
+docker run -it --rm --mount type=tmpfs,destination=/var/lib/postgresql/data pg_libphonenumber_test

run_tests.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-docker build -t pg_libphonenumber_test -f docker/Dockerfile .
-docker run -it --mount type=tmpfs,destination=/var/lib/postgresql/data pg_libphonenumber_test