Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

_fixperms no longer needed.

  • Loading branch information...
commit a960745865db8435b66eaf9f46acbc22a0e8e885 1 parent c00de5e
Christophe Troestler Chris00 authored
Showing with 0 additions and 99 deletions.
  1. +0 −7 Makefile
  2. +0 −11 _fixperms
  3. +0 −1  _headache.config
  4. +0 −80 test/test.ml
7 Makefile
View
@@ -149,10 +149,3 @@ dist:
./src/tools/oasis-dist.ml
.PHONY: dist
-
-# Fixing permissions
-
-fixperms:
- for i in $$(cat _fixperms); do chmod +x "./$$i"; done
-
-.PHONY: fixperms
11 _fixperms
View
@@ -1,11 +0,0 @@
-configure
-src/tools/oasis-dist.ml
-src/tools/oasis
-src/tools/oasis-i18n
-src/tools/oasis-announce.ml
-examples/custom/myconfigure
-test/data/bug982/test-setup-data.sh
-test/data/bug823/postconf.sh
-test/data/bug823/preconf.sh
-test/data/bug938/postconf.sh
-src/plugins/extra/devfiles/configure
1  _headache.config
View
@@ -35,7 +35,6 @@
| "_headache\\.config" -> frame open:"#" line:"#" close:"#"
| "_announce" -> no
| "_header" -> no
-| "_fixperms" -> no
| ".*\\.swp" -> no
| ".*\\.po" -> no
| ".*\\.po.bak" -> no
80 test/test.ml
View
@@ -32,86 +32,6 @@ let _ =
let () =
OASISBuiltinPlugins.init ()
in
- let () =
- if Sys.os_type <> "Win32" then
- begin
- (* Check permission before anything else. This is a little bit
- * outside the scope of testing, but will make tests fail. We
- * also check for completeness of _fixperms files, which should
- * help OASIS devel to fix it early.
- *)
- let topdir =
- Filename.parent_dir_name
- in
- let exec_set =
- let rst = ref SetString.empty in
- let chn = open_in (Filename.concat topdir "_fixperms") in
- let () =
- try
- while true do
- rst :=
- SetString.add
- (Filename.concat topdir (input_line chn))
- !rst
- done;
- with End_of_file ->
- ()
- in
- close_in chn;
- !rst
- in
- let fn_build = FilePath.concat topdir "_build" in
- let fn_build' = FilePath.concat topdir "build" in
- let fn_git = FilePath.concat topdir ".git" in
-
- let (found_missing, unfound) =
- (* Check files that need to be executable *)
- FileUtil.find
- (FileUtil.And
- (FileUtil.Custom
- (fun fn ->
- not (FilePath.is_subdir fn fn_build) &&
- not (FilePath.is_subdir fn fn_build') &&
- not (FilePath.is_subdir fn fn_git)),
- FileUtil.And
- (FileUtil.Is_exec,
- FileUtil.And
- (FileUtil.Is_file,
- FileUtil.Not FileUtil.Is_link))))
- topdir
- (fun (found_missing, unfound) fn ->
- if SetString.mem fn unfound then
- begin
- (found_missing, SetString.remove fn unfound)
- end
- else
- begin
- Printf.eprintf
- "E: File '%S' is executable but not in _fixperms\n%!"
- fn;
- (true, unfound)
- end)
- (false, exec_set)
- in
- if unfound <> SetString.empty then
- begin
- SetString.iter
- (fun fn ->
- if FileUtil.test FileUtil.Exists fn then
- Printf.eprintf
- "E: File '%S' should be executable, run 'make fixperms'\n%!"
- fn
- else
- Printf.eprintf
- "E: File '%S' in _fixperms but doesn't exist, remove it\n%!"
- fn)
- unfound;
- failwith "Fix your permissions"
- end
- else if found_missing then
- failwith "Fix your permissions"
- end
- in
run_test_tt_main
~arg_specs:test_args
~set_verbose
Please sign in to comment.
Something went wrong with that request. Please try again.